fix issue377
6 files changed