fixed bug with notification system