I have the exact same issue - TurboTax please fix this otherwise I'll just go and use FreeTaxUSA which appears to be doing this correctly for far less $$$
