bug fixing for multiple clouds