Fixed up to make disconnect/reconnect on ping failures work