Fix for issue 6202
2 files changed