Third try at tsv fix