T v fix (30/40)

T v fix