Fix regular onSubmit too