Fix issue with notify conditon check