Fixes #685