Fix for bug 246155.
3 files changed