Fixes #608