Fixed templating issue