Fix cross clouds