Another attempt to fix STA issue.