Fix bad behavor while pinging Clients