Fixes #678