Fix/mason2 gaps var tsv