Return value map did not correctly check policies