diff --git a/src/testdir/test_vim9_func.vim b/src/testdir/test_vim9_func.vim
index 025edd5..9e420ad 100644
--- a/src/testdir/test_vim9_func.vim
+++ b/src/testdir/test_vim9_func.vim
@@ -933,6 +933,21 @@
       delfunc g:Func
   END
   CheckScriptSuccess(lines)
+
+  # This does not shadow "i" which is visible only inside the for loop
+  lines =<< trim END
+      vim9script
+
+      def Foo(i: number)
+        echo i
+      enddef
+
+      for i in range(3)
+        # Foo() is compiled here
+        Foo(i)
+      endfor
+  END
+  CheckScriptSuccess(lines)
 enddef
 
 func TakesOneArg(arg)
diff --git a/src/version.c b/src/version.c
index d331c87..dafef8e 100644
--- a/src/version.c
+++ b/src/version.c
@@ -751,6 +751,8 @@
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    4016,
+/**/
     4015,
 /**/
     4014,
diff --git a/src/vim9compile.c b/src/vim9compile.c
index da93c1b..453e3f5 100644
--- a/src/vim9compile.c
+++ b/src/vim9compile.c
@@ -162,7 +162,6 @@
     hashitem_T	    *hi;
     int		    cc;
     sallvar_T	    *sav;
-    sallvar_T	    *found_sav;
     ufunc_T	    *ufunc;
 
     // Find the list of all script variables with the right name.
@@ -198,7 +197,6 @@
     // Go over the variables with this name and find one that was visible
     // from the function.
     ufunc = cctx->ctx_ufunc;
-    found_sav = sav;
     while (sav != NULL)
     {
 	int idx;
@@ -211,8 +209,8 @@
 	sav = sav->sav_next;
     }
 
-    // Not found, assume variable at script level was visible.
-    return found_sav;
+    // Not found, variable was not visible.
+    return NULL;
 }
 
 /*