Potential fix for bug 4479399
3 files changed