Fix for EvenDistributionSelectionStrategy TESB-10915