bug fixed in evaluator