Hotfix for template issue