Fix TsvExtractor