Fix issue #1036
2 files changed