Fix last name parsing