Hack to get arrays working
Merge.