Fixed issue #8506