Fix issue #8941

Fix issue #8941