Fixed ST3 compatibility