Fix ST3 compatibility