Void/Reissues and Reportable Income Reported Twice

Good Morning, I am curious if others have had a similar challenge and perhaps have identified a system resolution. Situation is that a payment is made to a vendor and reported on a 1099. Then the payment is voided and reissued, but in the following reporting period. Result is the payment is then reported twice if the void/reissue happens in the following reporting period (December payment, voided in February). Other than manually addressing any voids early in the calendar year to review for reporting impact, what other solution should we consider?

Secondarily, if you pull the combined reportable income report, your data is now out of sync with what was reported and will have a discrepancy (unless you set the "as of date").

Thank you!