Paying from the wrong purchase order

We get questions from our users on how to fix making a payment from the wrong purchase order. You can't use journal vouchers because they don't reference purchase orders. Some will use a regular voucher zero dollars to fix the wrong and correct po but this has limitations and doesn't always work with the reversing of the encumbrance on the po accounting entries. There is a correction style voucher but peoplebooks indicates this doesn't work well if commitment control is enabled. Wondering what other customers do when staff pays from the wrong purchase order. Especially if contracts are involved.

Thanks