fixes #6788