Merge "Fix a mistype in segment overrange checking"