diff --git a/src/fold.c b/src/fold.c
index 41fcee0..671bbf7 100644
--- a/src/fold.c
+++ b/src/fold.c
@@ -234,6 +234,8 @@
 	return FALSE;
     }
 
+    if (last > win->w_buffer->b_ml.ml_line_count)
+	last = win->w_buffer->b_ml.ml_line_count;
     if (lastp != NULL)
 	*lastp = last;
     if (firstp != NULL)
diff --git a/src/version.c b/src/version.c
index 4a35a90..9d1eb79 100644
--- a/src/version.c
+++ b/src/version.c
@@ -742,6 +742,8 @@
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    699,
+/**/
     698,
 /**/
     697,