Fix random_select