Fix to reduce bug of extractor