Additional fix for AME-4372