Better handle large second offsets