Fixed extractOne