Fix issue #1644
2 files changed