Is this fix required to finish before doing stuff like doing the push notification registration?