Fix issue #1039
3 files changed