Fix for template