Fix no name issue