Fix for cloud handling