fixed a bug in evaluator