Reinstated bounds check