diff --git a/src/Generator/Passes/FieldToPropertyPass.cs b/src/Generator/Passes/FieldToPropertyPass.cs
index 76113aac..176f4069 100644
--- a/src/Generator/Passes/FieldToPropertyPass.cs
+++ b/src/Generator/Passes/FieldToPropertyPass.cs
@@ -6,6 +6,14 @@ namespace CppSharp.Passes
 {
     public class FieldToPropertyPass : TranslationUnitPass
     {
+        public override bool VisitClassDecl(Class @class)
+        {
+            if (@class.CompleteDeclaration != null)
+                return VisitClassDecl(@class.CompleteDeclaration as Class);
+
+            return base.VisitClassDecl(@class);
+        }
+
         public override bool VisitFieldDecl(Field field)
         {
             if (!VisitDeclaration(field))