diff --git a/src/screen.c b/src/screen.c
index 55874e99fb..e0e9d3b7e2 100644
--- a/src/screen.c
+++ b/src/screen.c
@@ -4326,13 +4326,14 @@ win_line(
 	    if (text_props != NULL)
 	    {
 		int pi;
+		int bcol = (int)(ptr - line);
 
 		// Check if any active property ends.
 		for (pi = 0; pi < text_props_active; ++pi)
 		{
 		    int tpi = text_prop_idxs[pi];
 
-		    if (vcol >= text_props[tpi].tp_col - 1
+		    if (bcol >= text_props[tpi].tp_col - 1
 						  + text_props[tpi].tp_len)
 		    {
 			if (pi + 1 < text_props_active)
@@ -4347,7 +4348,7 @@ win_line(
 
 		// Add any text property that starts in this column.
 		while (text_prop_next < text_prop_count
-			   && vcol >= text_props[text_prop_next].tp_col - 1)
+			   && bcol >= text_props[text_prop_next].tp_col - 1)
 		    text_prop_idxs[text_props_active++] = text_prop_next++;
 
 		text_prop_attr = 0;
diff --git a/src/version.c b/src/version.c
index e3db6e5e35..53dda7f1d3 100644
--- a/src/version.c
+++ b/src/version.c
@@ -799,6 +799,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    676,
 /**/
     675,
 /**/