diff --git a/src/evalfunc.c b/src/evalfunc.c
index 03d64599b6..8057408d7e 100644
--- a/src/evalfunc.c
+++ b/src/evalfunc.c
@@ -517,8 +517,9 @@ arg_map_func(type_T *type, argcontext_T *context)
 	if (context->arg_types[0]->tt_type == VAR_LIST
 		|| context->arg_types[0]->tt_type == VAR_DICT)
 	    expected = context->arg_types[0]->tt_member;
-	else if (context->arg_types[0]->tt_type == VAR_STRING
-		|| context->arg_types[0]->tt_type == VAR_BLOB)
+	else if (context->arg_types[0]->tt_type == VAR_STRING)
+	    expected = &t_string;
+	else if (context->arg_types[0]->tt_type == VAR_BLOB)
 	    expected = &t_number;
 	if (expected != NULL)
 	{
diff --git a/src/version.c b/src/version.c
index e41dcb1457..260182bdf7 100644
--- a/src/version.c
+++ b/src/version.c
@@ -749,6 +749,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    3899,
 /**/
     3898,
 /**/