Change for ST2 compability (please try it out).