Fixing templating.