Backward fix of the clients.