fixed evaluation bug