Add hack to handle array that has both string/int as key