[PD] debugging patch