Fix issue #427
4 files changed