Fix ping handling