Fix Array iteration