Fixing the Data Table