DataTable fix