Fixes #861