issue #22155: Fix so tests pass