diff --git a/src/eval.c b/src/eval.c
index 119b7cc..87d2e16 100644
--- a/src/eval.c
+++ b/src/eval.c
@@ -300,7 +300,7 @@
 	s = skipwhite(s);
 	if (eval1_emsg(&s, rettv, NULL) == FAIL)
 	    return FAIL;
-	if (*s != NUL)  // check for trailing chars after expr
+	if (*skipwhite(s) != NUL)  // check for trailing chars after expr
 	{
 	    clear_tv(rettv);
 	    semsg(_(e_invexpr2), s);
diff --git a/src/testdir/test_filter_map.vim b/src/testdir/test_filter_map.vim
index 8883ea3..249c32f 100644
--- a/src/testdir/test_filter_map.vim
+++ b/src/testdir/test_filter_map.vim
@@ -11,6 +11,7 @@
   call assert_equal([2, 4, 6, 8], map([1, 2, 3, 4], 'v:val * 2'))
   call assert_equal([0, 2, 4, 6], map([1, 2, 3, 4], 'v:key * 2'))
   call assert_equal([9, 9, 9, 9], map([1, 2, 3, 4], 9))
+  call assert_equal([7, 7, 7], map([1, 2, 3], ' 7 '))
 endfunc
 
 " dict with expression string
diff --git a/src/version.c b/src/version.c
index c169daf..9e33c54 100644
--- a/src/version.c
+++ b/src/version.c
@@ -755,6 +755,8 @@
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    1360,
+/**/
     1359,
 /**/
     1358,