fixes #6819