Fix templating