fixed data tables bug