Partial fix for AME-4422