Fixes #881