Fix issue #1551
2 files changed