probably fixex the ping bug