#485 - fixing a couple issues with confirmed payments for rollback