One more hotfix to cloud