hotfix for production cloudq issue