Impove PING handling