diff --git a/src/userfunc.c b/src/userfunc.c
index 4da1dc0..f9f302a 100644
--- a/src/userfunc.c
+++ b/src/userfunc.c
@@ -523,7 +523,11 @@
 	    types_optional ? &argtypes : NULL, types_optional,
 						 NULL, NULL, TRUE, NULL, NULL);
     if (ret == FAIL || skip_arrow(s, equal_arrow) == NULL)
+    {
+	if (types_optional)
+	    ga_clear_strings(&argtypes);
 	return NOTDONE;
+    }
 
     // Parse the arguments again.
     if (evaluate)
@@ -535,7 +539,11 @@
 	    types_optional ? &argtypes : NULL, types_optional,
 					    &varargs, NULL, FALSE, NULL, NULL);
     if (ret == FAIL || (*arg = skip_arrow(*arg, equal_arrow)) == NULL)
+    {
+	if (types_optional)
+	    ga_clear_strings(&argtypes);
 	return NOTDONE;
+    }
 
     // Set up a flag for checking local variables and arguments.
     if (evaluate)
diff --git a/src/version.c b/src/version.c
index df91534..5420862 100644
--- a/src/version.c
+++ b/src/version.c
@@ -751,6 +751,8 @@
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    2205,
+/**/
     2204,
 /**/
     2203,