Notification Service bug fix