Fixed the notification triggering