Fixes #674