QCD with Deductible and Non Deductible IRA

Hello,

I have and interesting situation that I don't know exactly how to handle. I entered the 1099-R's for our RMD's and on 1 of them we made QCD's. Turbo Tax recorded on line 4a the total distributions without regard to the QCDs. I believe line 4b would normally be the net amount of the total distribution minus the QCDs. However, a couple years ago a financial advisor did something that wasn't very smart and combined a deductible and a non deductible IRA together. He did this for my wife as well. 

So now I go and complete the 8606-T and 8606-S that proportionally determines how much of my IRA distributions are actually taxable and puts that into the 1040 Line 4b. But this line no longer includes the QCD. 

Should I manually change the amount on line 4b and enter a note explaining what I did or is there something I missed which would reflect the "Total Distributions minus the non taxable portion minus the QCDs"?

 

Help would be appreciated.