fix issue196
8 files changed