Fixing superTenant domain issue