Fix issue with datatable