Fix the typescript