fixing support for AMI