fixing issue 378
8 files changed