Added check to see if glyph is defined first