Fixes #887