Bug fix in evaluator.