I have a 2017 1099-R with an amount in Box 1 - Gross distribution and Box 2 -Taxable amount. There are codes PJ in Box 7 - Distribution code(s). This is for excess contributions made in 2015, but not withdrawn until Jan. 2017. When I enter the information into TurboTax, it says "It loos like you may need to amend your 2016 return. Your 1099-R reports earnings on a contribution you made in 2016. This information needs to go on you 2016 return." Do I need to amend the 2016 return since the contribution nor withdrawal was made in 2016?