Compatibility change with SS3.0.1+