Fix support ST2