Honor T1 and T2 from server better