diff --git a/src/CppParser/Parser.cpp b/src/CppParser/Parser.cpp
index 22328cea..2a28d2f8 100644
--- a/src/CppParser/Parser.cpp
+++ b/src/CppParser/Parser.cpp
@@ -1630,9 +1630,10 @@ FunctionTemplate* Parser::WalkFunctionTemplate(const clang::FunctionTemplateDecl
 
     for (auto&& FD : TD->specializations())
     {
-        auto F = new Function();
-        HandleDeclaration(FD, F);
-        WalkFunction(FD, F);
+        if (auto MD = dyn_cast<CXXMethodDecl>(FD))
+            WalkMethodCXX(MD);
+        else
+            WalkFunction(FD);
     }
 
     return FT;