fix issue #6954