Add bounds checking.