Fix in TA mode²