Fix issue #42: fix cloud identity