diff --git a/src/evalvars.c b/src/evalvars.c
index e6fb3d8..9e1a24d 100644
--- a/src/evalvars.c
+++ b/src/evalvars.c
@@ -489,19 +489,21 @@
 
 /*
  * Prepare v: variable "idx" to be used.
- * Save the current typeval in "save_tv".
+ * Save the current typeval in "save_tv" and clear it.
  * When not used yet add the variable to the v: hashtable.
  */
     void
 prepare_vimvar(int idx, typval_T *save_tv)
 {
     *save_tv = vimvars[idx].vv_tv;
+    vimvars[idx].vv_str = NULL;  // don't free it now
     if (vimvars[idx].vv_type == VAR_UNKNOWN)
 	hash_add(&vimvarht, vimvars[idx].vv_di.di_key);
 }
 
 /*
  * Restore v: variable "idx" to typeval "save_tv".
+ * Note that the v: variable must have been cleared already.
  * When no longer defined, remove the variable from the v: hashtable.
  */
     void
diff --git a/src/testdir/test_filter_map.vim b/src/testdir/test_filter_map.vim
index 72a8d84..e144538 100644
--- a/src/testdir/test_filter_map.vim
+++ b/src/testdir/test_filter_map.vim
@@ -57,6 +57,9 @@
   let x = {"x":10}
   let r = map(range(2), 'filter(copy(x), "1")')
   call assert_equal([x, x], r)
+
+  let r = map(copy(x), 'filter(copy(x), "1")')
+  call assert_equal({"x": x}, r)
 endfunc
 
 " dict with funcref
diff --git a/src/testdir/test_functions.vim b/src/testdir/test_functions.vim
index 6984c23..20718bc 100644
--- a/src/testdir/test_functions.vim
+++ b/src/testdir/test_functions.vim
@@ -1543,6 +1543,10 @@
   let files = readdir('Xdir', {x -> len(add(l, x)) == 2 ? -1 : 1})
   call assert_equal(1, len(files))
 
+  " Nested readdir() must not crash
+  let files = readdir('Xdir', 'readdir("Xdir", "1") != []')
+  call sort(files)->assert_equal(['bar.txt', 'dir', 'foo.txt'])
+
   eval 'Xdir'->delete('rf')
 endfunc
 
diff --git a/src/version.c b/src/version.c
index f5c9eec..5dbdc9f 100644
--- a/src/version.c
+++ b/src/version.c
@@ -762,6 +762,8 @@
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    1968,
+/**/
     1967,
 /**/
     1966,