Fix issue #1409
2 files changed