Tax Payment Worksheet double counting K-1 credits?

Schedule K-1 Line 13 has two Credits for Estimated Taxes, $2203 and $842, totaling $3045.  Both have code 'A' although the $2203 was Federal withholding, and the $842 was MN State withholding.

The Tax Payment Worksheet seems to count these credits twice.  Am I missing something?

Line 7 - Credits by Estates and Trusts - shows $3045 which is then included in Line 8.  Note that not all of the $3045 was intended to be Federal, but the entire $3045 is shown under the Federal column.  If I double click on the $3045 it tells me the source is the K-1, and I presume it is Line 13.

Then Line 18a shows Other Withholding $2203 correctly under Federal, $842 correctly under State (MN). 

Line 20 Total Tax Payments appears to be overstating my Federal payments by $3045.  I am wondering if I should manually zero out Line 7 to fix this?