1041-es calculation doesn't account for capital gains

When will the calculation for 2018 estimated tax on form 1041-es be fixed to account for capital gains tax rates?

I have a trust with dividends and capital gains (sales and distributions) income. Turbo Tax Business carries all of 2017 income into the 2018 1041-es entry. Only the capital gains from 2017 sales are entered as capital gains estimates for 2018. I correct these estimates add the appropriate distribution deduction and look at the calculated tax. Turbo Tax Business doesn't use the Tax Computation Worksheet Using Capital Gains Rates and calculates a tax double what I will owe. Useless! I will continue with my spreadsheet method.