Fixes #686