Get your taxes done using TurboTax

I filed my 2020 return and realized after the fact that I am ineligible to contribute to a Roth in 2020.   In Sept 2021, I withdrew the excess 2020 contribution with the earnings and filed an amended return already paying for the tax on the earnings and penalty since I'm under 59.5.  However, when I received the 2021 1099-R, the distribution code used by Vanguard was J and 8, instead of J nd P.  Code 8 is Excess contributions plus earnings/excess deferrals taxable in 2021.   It seems like I am paying for the excess tax again.  How should this be handled?