Fix for AME-3020