added fix for composed last names