fixed notification system