Fixing Extraction