Corrected array handling