fixed some bug in evaluator