Fix issue #999
3 files changed