Fix issue #9640