fixes #609