Fixes #868