Bug #10498 fix