Retirement tax questions

Yes, that does work.  However, don't know about the legal issues with changing what was on the original 1099-R in order to correct the tax.  I'm hoping someone from TurboTax will respond as to if they plan on correcting an issue/error in their software.  Going to wait a week and see what happens.  I like TurboTax, been using it for well over 20 years now.  However, I am prepared to go with another tax software if  needed.