fixed issue 219
8 files changed