Fix for bug 194981
6 files changed