fixes #620