Fix Extracted from bug