Another hotfix for cloud staging