BISERVER-10003 Cannot save PIR (maybe others)