diff --git a/src/evalvars.c b/src/evalvars.c
index 965b2048e4..3be9993fdc 100644
--- a/src/evalvars.c
+++ b/src/evalvars.c
@@ -2898,7 +2898,11 @@ find_var_also_in_script(char_u *name, hashtab_T **htp, int no_autoload)
 		dictitem_T *di = find_var_in_ht(ht, 0, p + 1, no_autoload);
 
 		if (di != NULL)
+		{
+		    if (htp != NULL)
+			*htp = ht;
 		    return di;
+		}
 	    }
 	}
     }
diff --git a/src/version.c b/src/version.c
index 9e4ae19cb0..27512d44f4 100644
--- a/src/version.c
+++ b/src/version.c
@@ -750,6 +750,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    4041,
 /**/
     4040,
 /**/