fix the evaluation problem