fix for issue244
16 files changed