Fix issue #1917
4 files changed