fixed issue with partial evaluation infinite recursion