Hotfix world cloud functionality

@feanil please, merge.