Fixing array handling