Fix issue #1897
2 files changed