Notifications bug fixed 2