Zh fixes the client problem