fix data storage