fixed issue with long first names