Fixed which fields gets cleared on submit.