Fix for bug 28545
3 files changed