Fixed templating.