Fix ST3 issue