Enhance condition for check