diff --git a/src/normal.c b/src/normal.c
index 62b5f8c831..65f7773f88 100644
--- a/src/normal.c
+++ b/src/normal.c
@@ -8364,7 +8364,7 @@ nv_wordcmd(cap)
 	n = fwd_word(cap->count1, cap->arg, cap->oap->op_type != OP_NOP);
 
     /* Don't leave the cursor on the NUL past a line */
-    if (curwin->w_cursor.col && gchar_cursor() == NUL)
+    if (n != FAIL && curwin->w_cursor.col > 0 && gchar_cursor() == NUL)
     {
 	--curwin->w_cursor.col;
 	cap->oap->inclusive = TRUE;
diff --git a/src/version.c b/src/version.c
index aa41f50e47..bb8be8d2c1 100644
--- a/src/version.c
+++ b/src/version.c
@@ -666,6 +666,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    103,
 /**/
     102,
 /**/