TST-2 fix