Bug fixing for PO