Made the bounds_check=False more comprehensive.