Datatable fix added