p2p storage fix