diff --git a/libs/form-builder/package.json b/libs/form-builder/package.json
index 3042866..3b0f5fa 100644
--- a/libs/form-builder/package.json
+++ b/libs/form-builder/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@bedrockstreaming/form-builder",
-  "version": "0.8.3",
+  "main": "./src/index.ts",
   "dependencies": {
     "react-hook-form": "7.27.0"
   },
diff --git a/libs/form-builder/src/lib/components/submitField.component.tsx b/libs/form-builder/src/lib/components/submitField.component.tsx
index 5a65752..e380a2c 100644
--- a/libs/form-builder/src/lib/components/submitField.component.tsx
+++ b/libs/form-builder/src/lib/components/submitField.component.tsx
@@ -29,9 +29,11 @@ export function SubmitField({
   const handleNextStep = React.useCallback(
     (event) => {
       event.preventDefault();
-      onNextStep(getValues());
+      if (!nextDisabled) {
+        onNextStep(getValues());
+      }
     },
-    [onNextStep, getValues],
+    [onNextStep, getValues, nextDisabled],
   );
 
   return (
diff --git a/libs/form-validation-rule-list/package.json b/libs/form-validation-rule-list/package.json
index 9c94d10..88dd513 100644
--- a/libs/form-validation-rule-list/package.json
+++ b/libs/form-validation-rule-list/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@bedrockstreaming/form-validation-rule-list",
-  "version": "0.8.3",
+  "main": "./src/index.ts",
   "dependencies": {},
   "peerDependencies": {
     "react": "17.0.2",