diff --git a/src/search.c b/src/search.c
index 8089dcf36..7f019ed70 100644
--- a/src/search.c
+++ b/src/search.c
@@ -685,7 +685,7 @@ searchit(
 						    && pos->col < MAXCOL - 2)
 	{
 	    ptr = ml_get_buf(buf, pos->lnum, FALSE);
-	    if ((int)STRLEN(ptr) < pos->col)
+	    if ((int)STRLEN(ptr) <= pos->col)
 		start_char_len = 1;
 	    else
 		start_char_len = (*mb_ptr2len)(ptr + pos->col);
diff --git a/src/version.c b/src/version.c
index d3927cbd0..043cc623f 100644
--- a/src/version.c
+++ b/src/version.c
@@ -771,6 +771,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    1487,
 /**/
     1486,
 /**/