Fix PolicyId