fixes #6845