Fix issue #1257
17 files changed