Possible fix for P2P