fix for template support