Fixed missing ping/pong mechanism