diff --git a/src/AST/ClassExtensions.cs b/src/AST/ClassExtensions.cs
index ba35e1b5..bfb3075e 100644
--- a/src/AST/ClassExtensions.cs
+++ b/src/AST/ClassExtensions.cs
@@ -157,7 +157,7 @@ namespace CppSharp.AST
             Class @base = null;
 
             if (@class.HasBaseClass)
-                @base = @class.Bases[0].Class;
+                @base = @class.BaseClass;
 
             return @base?.IsRefType == true && @base.IsGenerated;
         }
diff --git a/src/Generator/Generators/C/CppHeaders.cs b/src/Generator/Generators/C/CppHeaders.cs
index 96f8c4f2..4af590a9 100644
--- a/src/Generator/Generators/C/CppHeaders.cs
+++ b/src/Generator/Generators/C/CppHeaders.cs
@@ -496,7 +496,7 @@ namespace CppSharp.Generators.Cpp
                 Write(" abstract sealed");
 
             if (!@class.IsStatic && @class.HasRefBase())
-                Write($" : public {QualifiedIdentifier(@class.Bases[0].Class)}");
+                Write($" : public {QualifiedIdentifier(@class.BaseClass)}");
         }
 
         public void GenerateClassProperties(Class @class)