Fix the issue with ST