Form 2210 is incorrect in TT2021

Form 2210 is populating with incorrect dates.  I've entered the correct estimated tax payment dates/amounts in the stepbystep, but the form is poplulating with 2020 dates in stead of 2021.  Column a reads "7/15/20" and includes the correct total for required installment line 10 for 7/15/2021, but the payment line 11 is not totaling both 1st and 2nd qtrs payments - it only has the 4/15/21 estimated payment.  It is missing the 6/15/21 payment so the net result is TT is indicating a penalty due when I have met the safeharbor requirements.