Fix ping/pong