ST3 compatibility fix