Extractor modified, Bug fix