Fix arrays selection