Array and map to datatable

I made this change a while ago, but my my tests throw an exception when I use 1.1.3 without this change