Second try at tsv fix