Fixed bug with the notification engine;