Fixed PING handling