fixed #955 (#956)

17 files changed