Templating fix