Add bounds checking back in