ClientId change type from int to long. Tested