Fix random selector and clean time