fix bugs in check evaluator