diff --git a/ChangeLog b/ChangeLog
index 1e6ed1e40..0ce96f15b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2003-02-09 18:34  Alexander Malmberg <alexander@malmberg.org>
+
+	* Source/GSHorizontalTypesetter.m (-breakLineByWordWrappingBefore:):
+	Return correct index when breaking at a control glyph.
+
 2003-02-09 18:02  Alexander Malmberg <alexander@malmberg.org>
 
 	* Headers/gnustep/gui/GSLayoutManager_internal.h,
diff --git a/Source/GSHorizontalTypesetter.m b/Source/GSHorizontalTypesetter.m
index 3942c9191..36efe9bca 100644
--- a/Source/GSHorizontalTypesetter.m
+++ b/Source/GSHorizontalTypesetter.m
@@ -229,8 +229,9 @@ the last time or not, we wouldn't need to clear the cache every time */
 
 /*
 Should return the first glyph on the next line, which must be <=gi and
->=cache_base (TODO: not enough). Glyphs up to and including gi will have
-been cached.
+>=cache_base (TODO: not enough. actually, it probably is now. the wrapping
+logic below will fall back to char wrapping if necessary). Glyphs up to and
+including gi will have been cached.
 */
 -(unsigned int) breakLineByWordWrappingBefore: (unsigned int)gi
 {
@@ -244,7 +245,7 @@ been cached.
   while (gi > 0)
     {
       if (g->g == NSControlGlyph)
-	return gi;
+	return gi + cache_base;
       ch = [str characterAtIndex: g->char_index];
       if (ch == 0x20 || ch == 0x0a || ch == 0x0d /* TODO: paragraph/line separator */ )
 	{
@@ -709,9 +710,12 @@ restart:
 	    /* TODO: this is a major bottleneck */
 /*	    if (last_glyph)
 	      {
+		BOOL n;
 		p = [f positionOfGlyph: g->g
 		      precededByGlyph: last_glyph
-		      isNominal: &g->nominal];
+		      isNominal: &n];
+		if (!n)
+		  g->nominal = NO;
 		p.x += last_p.x;
 		p.y += last_p.y;
 	      }*/