I think this is an issue with TurboTax which need to be fixed, at least starting from next tax filing year
