Fix issue #6968