Rework code for policy type

No match.