Fix evaluator