Fixed issue #8997