Do I amend my 2016 tax return before I do my 2017 tax return