Fix for even distribution selection strategy