Fix issue #1545
2 files changed