diff --git a/src/edit.c b/src/edit.c
index fae48c6..ad8b89a 100644
--- a/src/edit.c
+++ b/src/edit.c
@@ -9032,7 +9032,7 @@
 			       (linenr_T)(curwin->w_cursor.lnum + 1)) == FAIL)
 		return FALSE;
 	    --Insstart.lnum;
-	    Insstart.col = STRLEN(ml_get(Insstart.lnum));
+	    Insstart.col = (colnr_T)STRLEN(ml_get(Insstart.lnum));
 	}
 	/*
 	 * In replace mode:
diff --git a/src/version.c b/src/version.c
index 5958550..eef36b4 100644
--- a/src/version.c
+++ b/src/version.c
@@ -765,6 +765,8 @@
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    541,
+/**/
     540,
 /**/
     539,