fixing client ids