Fix storage pt2