Fixed TemplateManager