fix evaluator