fix issue410
6 files changed