Fixed issues with ST3