Multiple Notifications fix