fixes #654