Fixed bug with Notifications