Yep double and triple check because if you make an error you have to pay again and wait for a refund. There used to be a contact at the ATF named Ted Clutter who responded to email so quick. He would fix unapproved forms but yeah you had to pay twice and wait for a refund.