Additional fix for AME-4286