fix issue592
7 files changed