Fix issue #1613
2 files changed