Fix issue #1238
3 files changed