fixed #953 (#954)

9 files changed