fix problems of evaluation