fix of evaluate