diff --git a/src/normal.c b/src/normal.c

index be0e75e..7d62e20 100644

--- a/src/normal.c

+++ b/src/normal.c

@@ -7147,19 +7147,23 @@ nv_replace(cmdarg_T *cap)

 	    {

 		/*

 		 * Get ptr again, because u_save and/or showmatch() will have

-		 * released the line.  At the same time we let know that the

-		 * line will be changed.

+		 * released the line.  This may also happen in ins_copychar().

+		 * At the same time we let know that the line will be changed.

 		 */

-		ptr = ml_get_buf(curbuf, curwin->w_cursor.lnum, TRUE);

 		if (cap->nchar == Ctrl_E || cap->nchar == Ctrl_Y)

 		{

 		  int c = ins_copychar(curwin->w_cursor.lnum

 					   + (cap->nchar == Ctrl_Y ? -1 : 1));

+

+		  ptr = ml_get_buf(curbuf, curwin->w_cursor.lnum, TRUE);

 		  if (c != NUL)

 		    ptr[curwin->w_cursor.col] = c;

 		}

 		else

+		{

+		    ptr = ml_get_buf(curbuf, curwin->w_cursor.lnum, TRUE);

 		    ptr[curwin->w_cursor.col] = cap->nchar;

+		}

 		if (p_sm && msg_silent == 0)

 		    showmatch(cap->nchar);

 		++curwin->w_cursor.col;

diff --git a/src/testdir/test_edit.vim b/src/testdir/test_edit.vim

index 7278bcd..8818805 100644

--- a/src/testdir/test_edit.vim

+++ b/src/testdir/test_edit.vim

@@ -1387,3 +1387,15 @@ func Test_edit_quit()

   only

 endfunc

+" Test for getting the character of the line below after "p"

+func Test_edit_put_CTRL_E()

+  set encoding=latin1

+  new

+  let @" = ''

+  sil! norm or?ggRx

+  sil! norm pr?

+  call assert_equal(['r', 'r'], getline(1, 2))

+  bwipe!

+  set encoding=utf-8

+endfunc

+