Fix issue #1452
6 files changed