-Fixed the notification check part