Fix for numeric indices getting converted to strings