Fix for datatable codevalues