fix for bug 58417
3 files changed