Yes. The latest update fixed those issues. You can't just re edit the return. You MUST delete it from the File menu and re enter
