Fix issue with no last name