Fixed constructor, errors on empty cloud