Fix issue #8941