bugfix in Evaluator