Fixed issue #8804