fixing issue #352
3 files changed