better TSV handling