Fix data-representation