bugfix for clouds