Fixed templating problem