Proper ping handling