SI-8589 Added bounds checks