Fixing templating issue