Fix issue with Datatable