Fix data storage