diff --git a/src/tag.c b/src/tag.c
index b2ecb56561..07890943f1 100644
--- a/src/tag.c
+++ b/src/tag.c
@@ -1460,7 +1460,7 @@ find_tagfunc_tags(
     // create 'info' dict argument
     if ((d = dict_alloc_lock(VAR_FIXED)) == NULL)
 	return FAIL;
-    if (tag->user_data != NULL)
+    if (!(flags & TAG_INS_COMP) && tag->user_data != NULL)
 	dict_add_string(d, "user_data", tag->user_data);
     if (buf_ffname != NULL)
 	dict_add_string(d, "buf_ffname", buf_ffname);
diff --git a/src/version.c b/src/version.c
index 2644380c00..30f37349d3 100644
--- a/src/version.c
+++ b/src/version.c
@@ -734,6 +734,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    2116,
 /**/
     2115,
 /**/