Another fix to the extraction