Fixed ST2 compatibility issue from cdc22c0