diff --git a/src/option.c b/src/option.c
index 8543b48..2d47af3 100644
--- a/src/option.c
+++ b/src/option.c
@@ -8222,7 +8222,7 @@
 	    set_string_option(opt_idx, string, opt_flags);
 	else
 	{
-	    varp = get_varp(&options[opt_idx]);
+	    varp = get_varp_scope(&(options[opt_idx]), opt_flags);
 	    if (varp != NULL)	/* hidden option is not changed */
 	    {
 		if (number == 0 && string != NULL)
diff --git a/src/version.c b/src/version.c
index ec51a6c..d44083a 100644
--- a/src/version.c
+++ b/src/version.c
@@ -677,6 +677,8 @@
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    19,
+/**/
     18,
 /**/
     17,