Fix typecasting