My 2 cents, stop trying to manipulate the forms. I would wait for an official patch. You don't want to get audited due to turbo tax.
Glad I left this company.
