ClientID generation fixed