fix ping-pong