fixes #810