Small evaluator fix