Fix for broken datatables in upgrading to v2.2