fixing issue 378
7 files changed