Fix issue #118 (manually implementing PR #1832)
4 files changed