Elimiate race condition so plugin can support two clouds