diff --git a/src/drawline.c b/src/drawline.c
index 7db64d0ee5..5ad45c6c3c 100644
--- a/src/drawline.c
+++ b/src/drawline.c
@@ -3107,11 +3107,13 @@ win_line(
 		    char_u  *p = ptr - (mb_off + 1);
 		    chartabsize_T cts;
 
-		    init_chartabsize_arg(&cts, wp, lnum, wlv.vcol
+
+		    colnr_T init_colnr = wlv.vcol;
 # ifdef FEAT_PROP_POPUP
-							     - vcol_first_char,
+		    init_colnr -= vcol_first_char;
 # endif
-								      line, p);
+		    init_chartabsize_arg(&cts, wp, lnum, init_colnr, line, p);
+
 # ifdef FEAT_PROP_POPUP
 		    // do not want virtual text counted here
 		    cts.cts_has_prop_with_text = FALSE;
diff --git a/src/version.c b/src/version.c
index df2c7f0508..743af8af9a 100644
--- a/src/version.c
+++ b/src/version.c
@@ -729,6 +729,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    1902,
 /**/
     1901,
 /**/