Made extractor behaviour consistent