Added apparent (?) fix for segfaults when running on cloud