fixes #6832