Fix storage issue