diff --git a/src/fold.c b/src/fold.c
index 9606b68..3051739 100644
--- a/src/fold.c
+++ b/src/fold.c
@@ -3137,9 +3137,11 @@
      * order. We have to swap folds in the range [move_end, dest_index) with
      * those in the range [move_start, move_end).
      */
-    foldReverseOrder(gap, move_start, dest_index - 1);
-    foldReverseOrder(gap, move_start, move_start + dest_index - move_end - 1);
-    foldReverseOrder(gap, move_start + dest_index - move_end, dest_index - 1);
+    foldReverseOrder(gap, (linenr_T)move_start, (linenr_T)dest_index - 1);
+    foldReverseOrder(gap, (linenr_T)move_start,
+			   (linenr_T)(move_start + dest_index - move_end - 1));
+    foldReverseOrder(gap, (linenr_T)(move_start + dest_index - move_end),
+						   (linenr_T)(dest_index - 1));
 }
 #undef fold_end
 #undef valid_fold
diff --git a/src/version.c b/src/version.c
index e235fb8..bc85006 100644
--- a/src/version.c
+++ b/src/version.c
@@ -765,6 +765,8 @@
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    469,
+/**/
     468,
 /**/
     467,