bug fix with Client.cs