Fix TI_ST compatibility