TS fix agian