Hotfix for domain issue