Fixed Bug with NotificationService