Open Question: Help with 1040X form for First Time Home Buyer Credit?

I bought a home April 22, 2010. I know I have to ammend my taxes in order to get the $8,000 home buyer credit. I have an issue. While I was attempting to fill out the 1040x, my line 20 and 21 don’t equal $8,000, but rather $7,600. I think it is the $400 “Making Work Pay and Government Retiree Credits” that causing this. Should I add $400 to line 14? Here’s what my 1040x looks like: line11 = 3,549 (Federal income tax withheld) line12 = 0 line13 = 0 line14 = 8,000 (First Time Home Buyer Credit) line15 = 0 line16 = 11,549 (Total payments. Add lines 11 through 15) line17 = 575 (Amt overpaid from original return) line18 = 10,974 (Subtract line 17 from line 16) line19 = 0 line20 = 7,600 line21 = 7,600 (Amt refund)