diff --git a/src/formGenerator.vue b/src/formGenerator.vue
index 3c5f8c4d..e91b1494 100644
--- a/src/formGenerator.vue
+++ b/src/formGenerator.vue
@@ -8,7 +8,7 @@ div.vue-form-generator(v-if='schema != null')
 		fieldset(:is='tag', :class='getFieldRowClasses(group)')
 			legend(v-if='group.legend') {{ group.legend }}
 			template(v-for='field in group.fields')
-				form-group(v-if='fieldVisible(field)', :field="field", :errors="errors", :model="model", :options="options", @validated="onFieldValidated")
+				form-group(v-if='fieldVisible(field)', :field="field", :errors="errors", :model="model", :options="options", @validated="onFieldValidated", @model-updated="onModelUpdated")
 </template>
 
 <script>
@@ -148,6 +148,10 @@ export default {
 			this.$emit("validated", isValid, this.errors, this);
 		},
 
+		onModelUpdated(newVal, schema) {
+			this.$emit("model-updated", newVal, schema);
+		},
+
 		// Validating the model properties
 		validate(isAsync = null) {
 			if (isAsync === null) {
@@ -197,7 +201,7 @@ export default {
 			forEach(this.$children, child => {
 				child.clearValidationErrors();
 			});
-		}
+		},
 	}
 };
 </script>
diff --git a/src/formGroup.vue b/src/formGroup.vue
index 522f669a..1418cbb3 100644
--- a/src/formGroup.vue
+++ b/src/formGroup.vue
@@ -9,7 +9,7 @@
 		</label>
 
 		<div class="field-wrap">
-			<component ref="child" :is="getFieldType(field)" :disabled="fieldDisabled(field)" :model="model" :schema="field" :formOptions="options" @model-updated="modelUpdated" @validated="onFieldValidated"></component>
+			<component ref="child" :is="getFieldType(field)" :disabled="fieldDisabled(field)" :model="model" :schema="field" :formOptions="options" @model-updated="onModelUpdated" @validated="onFieldValidated"></component>
 			<div v-if="buttonVisibility(field)" class="buttons">
 				<button v-for="(btn, index) in field.buttons" @click="buttonClickHandler(btn, field, $event)" :class="btn.classes" :key="index" v-text="btn.label"></button>
 			</div>
@@ -96,7 +96,7 @@ export default {
 		fieldErrors(field) {
 			return this.errors.filter((e) => e.field === field).map((item) => item.error);
 		},
-		modelUpdated(newVal, schema) {
+		onModelUpdated(newVal, schema) {
 			this.$emit("model-updated", newVal, schema);
 		},
 		validate(calledParent) {