fix evaliation