added first last name fix