Added to bounds checking