Fix compatibility issue with ST2