fix issue656
6 files changed