diff --git a/ChangeLog b/ChangeLog
index 2f1b2a065..57c4726bd 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2016-10-22 Fred Kiefer <FredKiefer@gmx.de>
+
+	* Source/GSLayoutManager.m: Don't try to get the advancement for
+	NSControlGlyph.
+
 2016-10-08 Fred Kiefer <FredKiefer@gmx.de>
 
 	* Headers/AppKit/NSOutlineView.h
diff --git a/Source/GSLayoutManager.m b/Source/GSLayoutManager.m
index a90ec2955..334706454 100644
--- a/Source/GSLayoutManager.m
+++ b/Source/GSLayoutManager.m
@@ -3259,7 +3259,14 @@ forStartingGlyphAtIndex: (NSUInteger)glyph
     
   for (i=0; i<length; i++)
     {
-      advances[i] = [run->font advancementForGlyph: glyph_list[i]];
+      if (glyph_list[i] != NSControlGlyph)
+        {
+          advances[i] = [run->font advancementForGlyph: glyph_list[i]];
+        }
+      else
+        {
+          advances[i] = NSZeroSize;
+        }
     }
 
   [self insertGlyphs: glyph_list