ping-pong bugfix