After you file

Yes check your 2015 return 1040 line 71 and see if it happened again.  Then for 2016 do not transfer from 2015 or delete all the W2s and enter them each as new ones.