Fixes #676