Fix pm issue