Hotfix for email failures