Fix random select