diff --git a/docs/framework/react/guides/basic-concepts.md b/docs/framework/react/guides/basic-concepts.md
index 0f0e1155..bf4d72dc 100644
--- a/docs/framework/react/guides/basic-concepts.md
+++ b/docs/framework/react/guides/basic-concepts.md
@@ -212,6 +212,8 @@ Example:
 />
 ```
 
+More information can be found at [Listeners](./listeners.md)
+
 ## Array Fields
 
 Array fields allow you to manage a list of values within a form, such as a list of hobbies. You can create an array field using the `form.Field` component with the `mode="array"` prop.
diff --git a/docs/framework/react/guides/listeners.md b/docs/framework/react/guides/listeners.md
index cf10542f..a1fa5796 100644
--- a/docs/framework/react/guides/listeners.md
+++ b/docs/framework/react/guides/listeners.md
@@ -8,12 +8,12 @@ For situations where you want to "affect" or "react" to triggers, there's the li
 Imagine the following user flow:
 
 - User selects a country from a drop-down.
-- User then selects a county from another drop-down.
+- User then selects a province from another drop-down.
 - User changes the selected country to a different one.
 
-In this example, when the user changes the country, the selected county needs to be reset as it's no longer valid. With the listener API, we can subscribe to the onChange event and dispatch a reset to the field "county" when the listener is fired.
+In this example, when the user changes the country, the selected province needs to be reset as it's no longer valid. With the listener API, we can subscribe to the onChange event and dispatch a reset to the field "province" when the listener is fired.
 
-Other events that can be "listened" to are:
+Events that can be "listened" to are:
 
 - onChange
 - onBlur
@@ -25,7 +25,7 @@ function App() {
   const form = useForm({
     defaultValues: {
       country: '',
-      county: '',
+      province: '',
     },
     // ...
   })
@@ -41,7 +41,7 @@ function App() {
               onChange={(e) => field.handleChange(e.target.value)}
               listener={{
                 onChange: ({ value }) => {
-                  form.reset({county: ''})
+                  form.reset({province: ''})
                 }
               }}
             />
@@ -49,10 +49,10 @@ function App() {
         )}
       </form.Field>
 
-      <form.Field name="county">
+      <form.Field name="province">
         {(field) => (
           <label>
-            <div>County</div>
+            <div>Province</div>
             <input
               value={field.state.value}
               onChange={(e) => field.handleChange(e.target.value)}
diff --git a/packages/form-core/src/FieldApi.ts b/packages/form-core/src/FieldApi.ts
index 49a72d23..97b0ffc4 100644
--- a/packages/form-core/src/FieldApi.ts
+++ b/packages/form-core/src/FieldApi.ts
@@ -698,7 +698,7 @@ export class FieldApi<
     this.form.setFieldValue(this.name, updater as never, options)
 
     this.options.listeners?.onChange?.({
-      value: updater as never,
+      value: this.state.value,
       fieldApi: this,
     })
 
diff --git a/packages/form-core/src/FormApi.ts b/packages/form-core/src/FormApi.ts
index 03759d71..5acac6e5 100644
--- a/packages/form-core/src/FormApi.ts
+++ b/packages/form-core/src/FormApi.ts
@@ -982,7 +982,7 @@ export class FormApi<
 
     this.store.batch(() => {
       void (
-        Object.values(this.fieldInfo) as FieldInfo<any, TFormValidator>[]
+        Object.values(this.fieldInfo) as FieldInfo<TFormData, TFormValidator>[]
       ).forEach((field) => {
         field.instance?.options.listeners?.onSubmit?.({
           value: field.instance.state.value,
diff --git a/packages/form-core/tests/FormApi.spec.ts b/packages/form-core/tests/FormApi.spec.ts
index 2fc028bb..ee2b4b21 100644
--- a/packages/form-core/tests/FormApi.spec.ts
+++ b/packages/form-core/tests/FormApi.spec.ts
@@ -1718,7 +1718,6 @@ describe('form api', () => {
       listeners: {
         onSubmit: ({ value }) => {
           triggered = value
-          console.log(value)
         },
       },
     })