fix bug in evaluator