CLOUD-186 fixed amis