fix issue442
6 files changed