fix double-encoding of property names