Fixes #607