Is there a reason you need to wait for afterSubmit to change the fields?