fix extractors