That should fix the template issues