fixed the notification Problems