@macuser_22
Yes you are right and I do have form 8606 for 2019.
But my 1099-R issued to me in 2021 for the year 2020 has the cumulative sum of 12,000
You are also right that one would have to amend the tax return to show form 8606
