Fixed the extraction