IRA RMDs

I turned 72 in Dec so required to start taking RMD.  My understanding is I have until 1 April the first year to take the RMD.  My IRA took the RMD out of my account in 2021 and provided a 1099-R.  But my State retirement system waited until Mar of 2022 to take the RMD.  When completing my return in TT, I've come to a question "Tell us more about this retirement plan distribution".  I answered "Laird did not receive all the RMD for 2021" since a portion was paid in 2022.  On the next screen "Require Minimum Distribution", I entered the "Required Minimum Distribution  Amount" and "Actual Amount Received".  Since the amount received is less than the RMD amount, TT is calculating an add'l tax that should not be required since I supposedly have until 1 April to receive.  I have since received that add'l amount, but in 2022 and the withholdings are in 2022.  This seems to be a flaw in the TT logic.  How do I handle this situation?

Thanks