Resolve Bug in PMP