fix first name last name issue