[PD] Correctly upgrade Pd...