fix issue487
7 files changed