fixed data storage issue