Merge "Fix potential off-by-one"