Notification system is fixed