Remove boundary checks to fix regression, must redo the patch with more fuzzing