Fixed double storage issue