Notifications fix #2