Retirement tax questions

Sorry, most people are preparing 2018 tax returns now.  I missed the fact that the Roth IRA distribution occurred in 2017.  Yes, I should have said your 2017 Form 8606.  If that form was incorrect, you need to amend your 2017 tax return.