diff --git a/android-json-form-wizard/src/main/java/com/vijay/jsonwizard/widgets/RepeatingGroupFactory.java b/android-json-form-wizard/src/main/java/com/vijay/jsonwizard/widgets/RepeatingGroupFactory.java
index fdf1162ec..a9b2e2398 100644
--- a/android-json-form-wizard/src/main/java/com/vijay/jsonwizard/widgets/RepeatingGroupFactory.java
+++ b/android-json-form-wizard/src/main/java/com/vijay/jsonwizard/widgets/RepeatingGroupFactory.java
@@ -359,6 +359,7 @@ public void onTextChanged(CharSequence s, int start, int before, int count) {
             @Override
             public void afterTextChanged(Editable s) {
                 doneButton.setImageResource(R.drawable.ic_done_grey);
+                addOnDoneAction(referenceEditText, doneButton, widgetArgs);
                 ValidationStatus validationStatus = JsonFormFragmentPresenter
                         .validate(widgetArgs.getFormFragment(), referenceEditText, false);
                 if (validationStatus.isValid()) {
@@ -392,13 +393,22 @@ protected void addOnDoneAction(final TextView textView, final ImageButton doneBu
             InputMethodManager inputMethodManager = (InputMethodManager) widgetArgs.getFormFragment().getContext().getSystemService(Context.INPUT_METHOD_SERVICE);
             inputMethodManager.hideSoftInputFromWindow(textView.getWindowToken(), 0);
             textView.clearFocus();
+            int numberOfGroups = parseIntWithDefault(textView.getText().toString());
             attachRepeatingGroup(textView.getParent().getParent(),
-                    Integer.parseInt(textView.getText().toString()), doneButton, widgetArgs);
+                    numberOfGroups, doneButton, widgetArgs);
         } catch (Exception e) {
             Timber.e(e);
         }
     }
 
+    public static int parseIntWithDefault(String s) {
+        try {
+            return Integer.parseInt(s);
+        } catch(NumberFormatException e) {
+            return 0;
+        }
+    }
+
     private void attachRepeatingGroup(final ViewParent parent, final int numRepeatingGroups,
                                       final ImageButton doneButton, final WidgetArgs widgetArgs) {
         if (numRepeatingGroups > MAX_NUM_REPEATING_GROUPS) {
diff --git a/gradle.properties b/gradle.properties
index be0e5d994..e9b9df33e 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,4 +1,4 @@
-VERSION_NAME=1.14.5.2-SNAPSHOT
+VERSION_NAME=1.14.5.3-SNAPSHOT
 VERSION_CODE=1
 GROUP=org.smartregister
 POM_SETTING_DESCRIPTION=OpenSRP Client Native Form Json Wizard