Fixes #680