diff --git a/src/userfunc.c b/src/userfunc.c
index c50a871..4a12c19 100644
--- a/src/userfunc.c
+++ b/src/userfunc.c
@@ -3326,7 +3326,8 @@
     void
 ex_defcompile(exarg_T *eap UNUSED)
 {
-    int		todo = (int)func_hashtab.ht_used;
+    long_u	ht_used = func_hashtab.ht_used;
+    int		todo = (int)ht_used;
     hashitem_T	*hi;
     ufunc_T	*ufunc;
 
@@ -3338,7 +3339,17 @@
 	    ufunc = HI2UF(hi);
 	    if (ufunc->uf_script_ctx.sc_sid == current_sctx.sc_sid
 		    && ufunc->uf_dfunc_idx == UF_TO_BE_COMPILED)
+	    {
 		compile_def_function(ufunc, FALSE, NULL);
+
+		if (func_hashtab.ht_used != ht_used)
+		{
+		    // another function has been defined, need to start over
+		    hi = func_hashtab.ht_array;
+		    ht_used = func_hashtab.ht_used;
+		    todo = (int)ht_used;
+		}
+	    }
 	}
     }
 }
diff --git a/src/version.c b/src/version.c
index 5ccbfad..1730875 100644
--- a/src/version.c
+++ b/src/version.c
@@ -747,6 +747,8 @@
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    826,
+/**/
     825,
 /**/
     824,