Issue fix with datatable