fixed bug in evaluator