Fix data structure.