ping/pong fix