Fixed Evaluator Errors