Fixing TemplateBuilder.