Compatibility fix for ST2