diff --git a/Il2CppDumper/Il2CppIDAScriptDumper.cs b/Il2CppDumper/Il2CppIDAScriptDumper.cs
index 2377a48..a73dd23 100644
--- a/Il2CppDumper/Il2CppIDAScriptDumper.cs
+++ b/Il2CppDumper/Il2CppIDAScriptDumper.cs
@@ -63,7 +63,7 @@ def SetName(addr, name):
         }
 
         private void writeMethods() {
-            foreach (var type in model.Types.Where(t => t != null)) {
+            foreach (var type in model.Types) {
                 writeMethods(type.Name, type.DeclaredConstructors);
                 writeMethods(type.Name, type.DeclaredMethods);
             }
diff --git a/Il2CppInspector/Reflection/Il2CppModel.cs b/Il2CppInspector/Reflection/Il2CppModel.cs
index 4a60f05..bde67e7 100644
--- a/Il2CppInspector/Reflection/Il2CppModel.cs
+++ b/Il2CppInspector/Reflection/Il2CppModel.cs
@@ -36,8 +36,9 @@ namespace Il2CppInspector.Reflection
         public ConcurrentDictionary<ulong, TypeInfo> TypesByVirtualAddress { get; } = new ConcurrentDictionary<ulong, TypeInfo>();
 
         // Every type
-        public IEnumerable<TypeInfo> Types => new IEnumerable<TypeInfo>[] {TypesByDefinitionIndex, TypesByReferenceIndex, TypesByVirtualAddress.Values}
-            .SelectMany(t => t).Where(t => t != null).Distinct();
+        public IEnumerable<TypeInfo> Types => new IEnumerable<TypeInfo>[]
+                {TypesByDefinitionIndex, TypesByReferenceIndex, TypesByMethodSpecClassIndex.Values, TypesByVirtualAddress.Values}
+                .SelectMany(t => t).Distinct();
 
         // List of all methods ordered by their MethodDefinitionIndex
         public MethodBase[] MethodsByDefinitionIndex { get; }