ROTH Distribution Error for MASS Sched X

[BrownJD334]

From reading similar posts, it appears that TT has had this issue for quite some time.

TT states the value for Sched X Line A is being pulled from Federal Form 1040, line 4a (taxpayer amount) less federal Form 1099R, line 1 where the type in box 7 is 6, 8, G, N or Q (except taxable amount for type 8)... However, Federal Form 1040 Line 4a includes ROTH distributions which are not taxable. The value for Sched X A should be pulled from Federal Form 1040 line 4b, the TAXABLE amount, otherwise Mass will be taxing any distributions from a ROTH IRA.

Am I understanding correctly that the recommended action to fix this is to file FED taxes 1st, then change the Dist. Code to a Q to do Mass Taxes??