SI-5353 Fix Array unsoundness