Rework check logic