2nd Fix Notification behaviour