make cloud more compatible to wp code