diff --git a/package.json b/package.json
index 89a8ff2..987a142 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "esiur",
-  "version": "2.2.2",
+  "version": "2.2.3",
   "description": "Distributed Object Framework",
   "main": "esiur.js",
   "type": "module",
diff --git a/src/Proxy/TemplateGenerator.js b/src/Proxy/TemplateGenerator.js
index 7c9004e..a2768eb 100644
--- a/src/Proxy/TemplateGenerator.js
+++ b/src/Proxy/TemplateGenerator.js
@@ -94,7 +94,6 @@ export default class TemplateGenerator {
 
     rt += "\r\n}";
 
-    rt += `\r\nnew Esiur.Resource.Template.TypeTemplate(${className}, true);\r\n`
 
     rt = this._getDependenciesImports(dependencies) + rt;
     return rt;
@@ -316,6 +315,7 @@ export default class TemplateGenerator {
       templates.forEach((tmp) => {
           let typeName = tmp.className.split('.').join('_');
           module += `Esiur.define(module, ${typeName}, '${tmp.className}');\r\n`;
+          module += `new Esiur.Resource.Template.TypeTemplate(${typeName}, true);\r\n`
       });
 
       module += "\r\nexport default module;";
@@ -353,7 +353,6 @@ export default class TemplateGenerator {
 
     rt += "\r\n}";
 
-    rt += `\r\nnew Esiur.Resource.Template.TypeTemplate(${className}, true);\r\n`
 
     rt = this._getDependenciesImports(dependencies) + rt;
     return rt;
@@ -512,8 +511,6 @@ export default class TemplateGenerator {
     rt += `\r\nstatic get template() {return new Esiur.Resource.Template.TemplateDescriber('${namespace}', [\r\n${[...descProps, ...descFuncs, ...descEvents, ...descConsts].join(',\r\n')}], \r\n${parentName}, ${template.version}, ${this.toLiteral(template.annotation)}, Esiur.Data.Guid.parse('${template.classId.toString()}'), '${className}');\r\n}`;
 
     rt += "\r\n}\r\n";
-
-    rt += `\r\nnew Esiur.Resource.Template.TypeTemplate(${className}, true);\r\n`
     
     rt = this._getDependenciesImports(dependencies) + rt;
     return rt;