Fixes #609