diff --git a/src/Parser/ASTConverter.cs b/src/Parser/ASTConverter.cs
index 62769909..07b5ea4a 100644
--- a/src/Parser/ASTConverter.cs
+++ b/src/Parser/ASTConverter.cs
@@ -940,6 +940,13 @@ namespace CppSharp
                 _ctx.Functions.Add(_decl);
             }
 
+            for (uint i = 0; i < ctx.TemplatesCount; ++i)
+            {
+                var decl = ctx.getTemplates(i);
+                var _decl = Visit(decl) as AST.Template;
+                _ctx.Templates.Add(_decl);
+            }
+
             for (uint i = 0; i < ctx.ClassesCount; ++i)
             {
                 var decl = ctx.getClasses(i);
@@ -948,13 +955,6 @@ namespace CppSharp
                     _ctx.Classes.Add(_decl);
             }
 
-            for (uint i = 0; i < ctx.TemplatesCount; ++i)
-            {
-                var decl = ctx.getTemplates(i);
-                var _decl = Visit(decl) as AST.Template;
-                _ctx.Templates.Add(_decl);
-            }
-
             for (uint i = 0; i < ctx.TypedefsCount; ++i)
             {
                 var decl = ctx.getTypedefs(i);