Fix for Bug 391568.
3 files changed