fixed the notification issues