Fixing last name crash