Wow, well that makes sense why it doesn't work properly on the form, but that's a PITA.

So what if you didnt pay back the full amount, what if you only paid back 50% of it?  

Say I got a 30,000 dist in 2020

in 2022 I pay back 15,000. 

Does the 2020 get amended to remove the whole 10k,

then 2021 amended to remove 5k,

then you pay the tax on the 10k in 2022?