fixing more evaluation