Changed the notification check