fix for issue 350
7 files changed