hotfix for exchange code