Fixed bugs for ST3