fixing templating