fix issue443
9 files changed