diff --git a/src/register.c b/src/register.c
index f381e30..8a4ae67 100644
--- a/src/register.c
+++ b/src/register.c
@@ -832,8 +832,9 @@
 		    if ((State & REPLACE_FLAG) != 0)
 		    {
 			pos_T curpos;
-			u_save_cursor();
-			del_bytes((long)STRLEN(y_current->y_array[0]), TRUE, FALSE);
+			if (u_save_cursor() == FAIL)
+			    return FAIL;
+			del_chars((long)mb_charlen(y_current->y_array[0]), TRUE);
 			curpos = curwin->w_cursor;
 			if (oneright() == FAIL)
 			    // hit end of line, need to put forward (after the current position)
diff --git a/src/testdir/test_registers.vim b/src/testdir/test_registers.vim
index 50f3910..367d914 100644
--- a/src/testdir/test_registers.vim
+++ b/src/testdir/test_registers.vim
@@ -949,7 +949,7 @@
 func Test_insert_small_delete_replace_mode()
   new
   call setline(1, ['foo', 'bar', 'foobar',  'bar'])
-  let @-='foo'
+  let @- = 'foo'
   call cursor(2, 1)
   exe ":norm! R\<C-R>-\<C-R>-"
   call assert_equal('foofoo', getline(2))
@@ -960,9 +960,21 @@
   exe ":norm! R\<C-R>-ZZZZ"
   call assert_equal(['foo', 'foofoo', '',  'bfoobarZZZZ'], getline(1, 4))
   call cursor(1, 1)
-  let @-=''
+  let @- = ''
   exe ":norm! R\<C-R>-ZZZ"
   call assert_equal(['ZZZ', 'foofoo', '',  'bfoobarZZZZ'], getline(1, 4))
+  let @- = 'βbβ'
+  call cursor(4, 1)
+  exe ":norm! R\<C-R>-"
+  call assert_equal(['ZZZ', 'foofoo', '',  'βbβobarZZZZ'], getline(1, 4))
+  let @- = 'bβb'
+  call cursor(4, 1)
+  exe ":norm! R\<C-R>-"
+  call assert_equal(['ZZZ', 'foofoo', '',  'bβbobarZZZZ'], getline(1, 4))
+  let @- = 'βbβ'
+  call cursor(4, 1)
+  exe ":norm! R\<C-R>-"
+  call assert_equal(['ZZZ', 'foofoo', '',  'βbβobarZZZZ'], getline(1, 4))
   bwipe!
 endfunc
 
diff --git a/src/version.c b/src/version.c
index 76a7668..b221faa 100644
--- a/src/version.c
+++ b/src/version.c
@@ -705,6 +705,8 @@
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    21,
+/**/
     20,
 /**/
     19,