Fix issue #1264
7 files changed