Vanguard 1099-R & Form 8608

I have after-tax contributions to an IRA. In 2019, I took my first RMD and rolled over IRA money into my Roth IRA. Vanguard combined the RMD distribution and the rollover into one 1099-R. If I download or manually enter the 1099-R, TurboTax doesn't have a place to separate the two distributions the result is form 8606 isn't correctly filled out. 8606 Part II is blank and the 8606 Part I calculation is different using the combined numbers resulting in a higher taxable amount. What's the best way to address this issue?

 

Thanks