Fix issue #10040