Merge "Fix an off-by-one error."