diff --git a/src/option.c b/src/option.c
index 182ff341c..decba501a 100644
--- a/src/option.c
+++ b/src/option.c
@@ -807,7 +807,7 @@ free_all_options(void)
 	else if (options[i].var != VAR_WIN
 		&& (options[i].flags & P_STRING))
 	    // buffer-local option: free global value
-	    free_string_option(*(char_u **)options[i].var);
+	    clear_string_option((char_u **)options[i].var);
     }
 }
 #endif
diff --git a/src/version.c b/src/version.c
index 6b372008c..7710018b3 100644
--- a/src/version.c
+++ b/src/version.c
@@ -755,6 +755,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    3246,
 /**/
     3245,
 /**/