Fixed when name is empty