fixing the evaluations