fixes #6754