Fixes cloud bug