Partial fix of PING issue