Stage2 ClientID assignment fixed.