Fix P2P conversation bug