fix issue453
13 files changed