templating fix