Fix to templates