Fix pnp format