Datatable bug fix