fixed #950 (#951)

47 files changed