Fixed PD issue