better T0 fix