Fixed PeerId issue