fix even more evaluation order