fix evaluation issues