Fixed PO crash