fix t3.1 only