make oa policy function even more robust