Fix issue #6925