Bugfix for Enterprise deployments