Retirement tax questions

Okay, well I didn't make any changes because it was already filed and approved so it won't even let me make a change if I wanted to. It says I have to wait until the 1040X form is available to file and amend. So I guess I'll wait, get my return and then go in and fix it? Correct? Is that the easiest and best way to do it?