TS: Fix crashing with CSA