fix for 22195
3 files changed