[PD] Cleaned patch for Jupiter