Small fix of notification behaviour