issue #21605: Fix selection problems.'