I had this same issue in 2020 working on the 2019 Tax year returns. Your solution worked. Shame on Turbo Tax. I almost paid $5,000 in extra income tax because of improper calculations.
