fix issue433
7 files changed