Fix to iterate existing array