[PD] bugs fixed