Notifications fix