Fix for bug 240926
3 files changed