diff --git a/src/ftxgdef.c b/src/ftxgdef.c
index d1cbda1e8..36146970d 100644
--- a/src/ftxgdef.c
+++ b/src/ftxgdef.c
@@ -298,6 +298,8 @@
     
     Free_NewGlyphClasses( gdef, memory );
 
+    FREE( gdef );
+
     return TT_Err_Ok;
   }
 
@@ -1034,6 +1036,8 @@
     gdef->MarkAttachClassDef_offset = 0L;
     gdef->MarkAttachClassDef.loaded = FALSE;
 
+    gcd->loaded = TRUE;
+
     return TT_Err_Ok;
 
   Fail1: