diff --git a/src/buffer.c b/src/buffer.c
index 26d77236f..9ef8a5082 100644
--- a/src/buffer.c
+++ b/src/buffer.c
@@ -3722,7 +3722,7 @@ build_stl_str_hl(
 	    {
 		/* remove group if all items are empty */
 		for (n = groupitem[groupdepth] + 1; n < curitem; n++)
-		    if (item[n].type == Normal)
+		    if (item[n].type == Normal || item[n].type == Highlight)
 			break;
 		if (n == curitem)
 		{
diff --git a/src/version.c b/src/version.c
index e2615be18..6141a2e4e 100644
--- a/src/version.c
+++ b/src/version.c
@@ -743,6 +743,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    1511,
 /**/
     1510,
 /**/