Fixed empty name issue