Fix the client problem