diff --git a/src/normal.c b/src/normal.c
index 6bef56d..73505a6 100644
--- a/src/normal.c
+++ b/src/normal.c
@@ -21,7 +21,7 @@
 static int	resel_VIsual_mode = NUL;	/* 'v', 'V', or Ctrl-V */
 static linenr_T	resel_VIsual_line_count;	/* number of lines */
 static colnr_T	resel_VIsual_vcol;		/* nr of cols or end col */
-static int	VIsual_mode_orig = NUL;         /* type of Visual mode, that user entered */
+static int	VIsual_mode_orig = NUL;		/* saved Visual mode */
 
 static int	restart_VIsual_select = 0;
 #endif
@@ -6202,8 +6202,17 @@
 			    || cap->oap->op_type == OP_CHANGE)
 			&& !lineempty(curwin->w_cursor.lnum))
 		{
-		    if (*ml_get_cursor() != NUL)
-			++curwin->w_cursor.col;
+		    char_u *cp = ml_get_cursor();
+
+		    if (*cp != NUL)
+		    {
+#ifdef FEAT_MBYTE
+			if (has_mbyte)
+			    curwin->w_cursor.col += (*mb_ptr2len)(cp);
+			else
+#endif
+			    ++curwin->w_cursor.col;
+		    }
 		    cap->retval |= CA_NO_ADJ_OP_END;
 		}
 		continue;
@@ -9482,7 +9491,7 @@
 # ifdef FEAT_CLIPBOARD
 	    adjust_clip_reg(&regname);
 # endif
-           if (regname == 0 || regname == '"'
+	   if (regname == 0 || regname == '"'
 				     || VIM_ISDIGIT(regname) || regname == '-'
 # ifdef FEAT_CLIPBOARD
 		    || (clip_unnamed && (regname == '*' || regname == '+'))
diff --git a/src/testdir/test69.in b/src/testdir/test69.in
index f18ee37..75317b4 100644
--- a/src/testdir/test69.in
+++ b/src/testdir/test69.in
@@ -155,6 +155,16 @@
 ａａb
 
 STARTTEST
+:set whichwrap+=h
+/^x
+dh
+:set whichwrap-=h
+ENDTEST
+
+á
+x
+
+STARTTEST
 :let a = '.é.' " one char of two bytes
 :let b = '.é.' " normal e with composing char
 /^byteidx
diff --git a/src/testdir/test69.ok b/src/testdir/test69.ok
index 1ff82f2..41cd9d0 100644
--- a/src/testdir/test69.ok
+++ b/src/testdir/test69.ok
@@ -150,6 +150,9 @@
 aaa
 
 
+áx
+
+
 byteidx
 [0, 1, 3, 4, -1]
 [0, 1, 4, 5, -1]
diff --git a/src/version.c b/src/version.c
index 8dcd656..dccd84b 100644
--- a/src/version.c
+++ b/src/version.c
@@ -739,6 +739,8 @@
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    187,
+/**/
     186,
 /**/
     185,