fix for bug 32884
4 files changed