Fix for ST2 compatibility