Fix Notification behaviour