Fix the notification check, taken from CP