@TaxGuyBill wow, what an amazing answer!!!! Million thanks. We will definitely try that.
Since the audit is pending, do you think that we should present the auditor with the completed form or present him with a 2016 1040x?