Fix to show last names