This should fix the templating issue