Fix for bugzilla 394862
2 files changed