diff --git a/src/fold.c b/src/fold.c
index 90fafea636..3c106d25cf 100644
--- a/src/fold.c
+++ b/src/fold.c
@@ -1515,6 +1515,9 @@ foldMarkAdjustRecurse(
     linenr_T	last;
     linenr_T	top;
 
+    if (gap->ga_len == 0)
+	return;
+
     // In Insert mode an inserted line at the top of a fold is considered part
     // of the fold, otherwise it isn't.
     if ((State & INSERT) && amount == (linenr_T)1 && line2 == MAXLNUM)
diff --git a/src/version.c b/src/version.c
index 8155ffccb9..92c533c883 100644
--- a/src/version.c
+++ b/src/version.c
@@ -754,6 +754,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    1554,
 /**/
     1553,
 /**/