Merge "Fix harmless off-by-1 error."