Retirement tax questions

The 1099R is from a brokerage company and the codes are J & P and we did file our 2024 return by 4/15/25.  So it sounds like we need to amend our 2024 return since box 2a is greater than zero.  However, box 1 on the 1099R includes the Roth contribution plus the earnings, yet the Roth contribution monies are after tax.  It seems like the 1099R I received is incorrect since the monies for the contribution were not pre-tax and shouldn't be included as a distribution.  The monies were a distribution but not income.  Do you agree?  Thank you.