Fix data table construction