fix issue625
27 files changed