I know you have three years to file an amended return, but if you file it before the tax deadline then you can avoid a penalty. I filed on March 26th and got my return on April 7th. Yes, I will file an amended return when the form is ready and pay what I owe back to them. People need their money right now.
