Notification bug fix