CLOUD-216 ami problem fix