Fix for ST3

Still works in ST2