fix notification system