Improve robustness of PD maker for higher dimensional PDs.