diff --git a/src/charset.c b/src/charset.c
index fcc41ec..006caa2 100644
--- a/src/charset.c
+++ b/src/charset.c
@@ -1184,6 +1184,8 @@
 	{
 	    col -= W_WIDTH(wp);
 	    numberextra = W_WIDTH(wp) - (numberextra - win_col_off2(wp));
+	    if (*p_sbr != NUL && col >= (colnr_T)STRLEN(p_sbr))
+		col -= (colnr_T)STRLEN(p_sbr);
 	    if (numberextra > 0)
 		col = col % numberextra;
 	}
diff --git a/src/version.c b/src/version.c
index f22d195..d7c4cc0 100644
--- a/src/version.c
+++ b/src/version.c
@@ -742,6 +742,8 @@
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    473,
+/**/
     472,
 /**/
     471,