Fixes #831
5 files changed