correctly overflow when indexes are too large
3 files changed