Hotfix for template client