PO-PI mapping: divisional loss issue fixed