fix for cloud