RT#7180: fix refund problems