Small fix for ping/pong