diff --git a/ChangeLog b/ChangeLog
index 837f9c29f..7afb1dc6b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2003-02-24 15:24  Alexander Malmberg <alexander@malmberg.org>
+
+	* Source/GSLayoutManager.m (-invalidateGlyphsForCharacterRange:
+	changeInLength:actualCharacterRange:): Set the next character index
+	correctly after the run-merge optimization.
+
 2003-02-24 03:49  Alexander Malmberg <alexander@malmberg.org>
 
 	* Source/GSLayoutManager.m (-_glyphForCharacter:index:positions::):
diff --git a/Source/GSLayoutManager.m b/Source/GSLayoutManager.m
index 1f1358ff6..1d56b8215 100644
--- a/Source/GSLayoutManager.m
+++ b/Source/GSLayoutManager.m
@@ -1259,7 +1259,7 @@ places where we switch.
 		new->head.complete = 0;
 	      }
 	    new->head.char_length += rng.length;
-	    ch += new->head.char_length;
+	    ch = NSMaxRange(rng);
 	    continue;
 	  }