diff --git a/fonts.js b/fonts.js
index bcec5d2ac..2bcfa5e6e 100644
--- a/fonts.js
+++ b/fonts.js
@@ -2613,14 +2613,13 @@ var Type2CFF = (function type2CFF() {
         var glyph = charsets[i];
         var code = glyphMap[glyph] || 0;
 
-        var mapping = glyphs[code] || glyphs[glyph] || {};
+        var mapping = glyphs[code] || glyphs[glyph] || { width: defaultWidth };
         var unicode = mapping.unicode;
 
         if (unicode <= 0x1f || (unicode >= 127 && unicode <= 255))
           unicode += kCmapGlyphOffset;
 
-        var width = ('width' in mapping) && isNum(mapping.width) ? mapping.width
-                                                                 : defaultWidth;
+        var width = isNum(mapping.width) ? mapping.width : defaultWidth;
         properties.encoding[code] = {
           unicode: unicode,
           width: width