Are you working on your 2020 return? You need to use the Desktop program to do 2020 now. After you enter the 1099R for the 25,000 you say you rolled over the 17,000 even if you put it back into the same account.
