Fixed introduced compile from last commit due changed refactor evaluate interface