Fix for bug 41395
2 files changed