Fix issue 378
3 files changed