Fix double templating