Templating bug fix.