[+] Mo: fix for PNM-1542