Notification behaviour fix