Fixing Extraction Bug