changed ping handling