On the cloud, fix #34