Apply additional fix for AME-5261
Apply additional fix for AME-5261