Fix issue #2061
2 files changed