Fix regression for ST3