Fixes #120 (broken cloud)