fixes #650