Bug fix with client.cs