TypeScript fix