Correct PO generation (refs #3460)