evaluator fix