Fix to template