Fixes #885