Fix match issuee in toPM