fix for 23717
2 files changed