Bug fix for push notifications
More bug fix for push notifications