fix issue258
8 files changed