first name / last name fix