Clients are now properly assigned IDs