Fix issue #10867