Fix of push notification system