Line 11 includes income tax and the Net Investment Income Tax

But LA-541 Instructions state:

“Line 11. Federal Income Tax Liability

Enter the actual federal tax liability after being reduced for all credits except the alternative minimum tax credit. Do not include the net investment income tax or any amounts paid under IRC Section 965.”

Line 20 of LA-541 Schedule D includes NIIT (which is correctly being added from a worksheet).

The net effect is the Net Investment Income Tax is being doubled.  

Is there going to be an update (the form is not final)  or is there a workaround?