Fixed issue #9998