diff --git a/src/Generator/Generators/CLI/CLIHeadersTemplate.cs b/src/Generator/Generators/CLI/CLIHeadersTemplate.cs
index 8403e3f3..aa9ebf2e 100644
--- a/src/Generator/Generators/CLI/CLIHeadersTemplate.cs
+++ b/src/Generator/Generators/CLI/CLIHeadersTemplate.cs
@@ -269,16 +269,15 @@ namespace CppSharp.Generators.CLI
 
             GenerateClassVariables(@class);
 
-            if (@class.Fields.Any())
-            {
-                PushBlock(CLIBlockKind.AccessSpecifier);
-                WriteLine("private:");
-                PopBlock(NewLineKind.IfNotEmpty);
-
-                PushBlock(CLIBlockKind.Fields);
-                GenerateClassFields(@class);
-                PopBlock();
-            }
+            PushBlock(CLIBlockKind.AccessSpecifier);
+            WriteLine("private:");
+            var accBlock = PopBlock(NewLineKind.IfNotEmpty);
+
+            PushBlock(CLIBlockKind.Fields);
+            GenerateClassFields(@class);   
+            var fieldsBlock = PopBlock();
+
+            accBlock.CheckGenerate = () => !fieldsBlock.IsEmpty;
 
             WriteLine("};");
         }