diff --git a/src/mouse.c b/src/mouse.c
index a094df6..c2bde6d 100644
--- a/src/mouse.c
+++ b/src/mouse.c
@@ -3065,7 +3065,7 @@
     varnumber_T winid = 0;
     varnumber_T winrow = 0;
     varnumber_T wincol = 0;
-    linenr_T	line = 0;
+    linenr_T	lnum = 0;
     varnumber_T column = 0;
 
     if (rettv_dict_alloc(rettv) != OK)
@@ -3099,14 +3099,8 @@
 	    col -= left_off;
 	    if (row >= 0 && row < wp->w_height && col >= 0 && col < wp->w_width)
 	    {
-		int	count;
-
-		mouse_comp_pos(wp, &row, &col, &line, NULL);
-
-		// limit to text size plus one
-		count = linetabsize(ml_get_buf(wp->w_buffer, line, FALSE));
-		if (col > count)
-		    col = count;
+		if (!mouse_comp_pos(wp, &row, &col, &lnum, NULL))
+		    col = vcol2col(wp, lnum, col);
 		column = col + 1;
 	    }
 	}
@@ -3114,7 +3108,7 @@
     dict_add_number(d, "winid", winid);
     dict_add_number(d, "winrow", winrow);
     dict_add_number(d, "wincol", wincol);
-    dict_add_number(d, "line", (varnumber_T)line);
+    dict_add_number(d, "line", (varnumber_T)lnum);
     dict_add_number(d, "column", column);
 }
 #endif
diff --git a/src/testdir/test_functions.vim b/src/testdir/test_functions.vim
index ce868c2..d97522a 100644
--- a/src/testdir/test_functions.vim
+++ b/src/testdir/test_functions.vim
@@ -2753,6 +2753,16 @@
 func Test_getmousepos()
   enew!
   call setline(1, "\t\t\t1234")
+  call test_setmouse(1, 1)
+  call assert_equal(#{
+        \ screenrow: 1,
+        \ screencol: 1,
+        \ winid: win_getid(),
+        \ winrow: 1,
+        \ wincol: 1,
+        \ line: 1,
+        \ column: 1,
+        \ }, getmousepos())
   call test_setmouse(1, 25)
   call assert_equal(#{
         \ screenrow: 1,
@@ -2761,7 +2771,7 @@
         \ winrow: 1,
         \ wincol: 25,
         \ line: 1,
-        \ column: 25,
+        \ column: 4,
         \ }, getmousepos())
   call test_setmouse(1, 50)
   call assert_equal(#{
@@ -2771,7 +2781,7 @@
         \ winrow: 1,
         \ wincol: 50,
         \ line: 1,
-        \ column: 29,
+        \ column: 8,
         \ }, getmousepos())
   bwipe!
 endfunc
diff --git a/src/version.c b/src/version.c
index f211594..a8a8a64 100644
--- a/src/version.c
+++ b/src/version.c
@@ -751,6 +751,8 @@
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    4559,
+/**/
     4558,
 /**/
     4557,