fix ping/pong