Fix issue #861 (and previous commit, for that matter)
3 files changed