diff --git a/src/Generator/Library.cs b/src/Generator/Library.cs
index 903c25df..9177ae08 100644
--- a/src/Generator/Library.cs
+++ b/src/Generator/Library.cs
@@ -229,15 +229,12 @@ namespace CppSharp
         public static void CopyClassFields(this ASTContext context, string source,
             string destination)
         {
-            foreach (var @class in context.FindClass(source))
-            {
-                foreach (var dest in context.FindClass(destination))
-                {
-                    dest.Fields.AddRange(@class.Fields);
-                    foreach (var field in dest.Fields)
-                        field.Namespace = dest;
-                }
-            }
+            var @class = context.FindCompleteClass(source);
+            var dest = context.FindCompleteClass(destination);
+
+            dest.Fields.AddRange(@class.Fields);
+            foreach (var field in dest.Fields)
+                field.Namespace = dest;
         }
 
         #endregion