- fixed issue with Evaluator