You saved my day too! So many things that could go wrong on this topic. Just as complicated as Remote Push Notifications.