-Fixed bugs with working with TSv3