Fix #3130 using the datatable