Another attempt to fix the templating