fixed the templating issue