Fixed code and added line when having no name