Fix issue #1978
3 files changed