--- lib/MT/Template/ContextHandlers.pm.bak	Fri Sep  2 16:13:00 2005
+++ lib/MT/Template/ContextHandlers.pm	Sun Sep 11 05:32:17 2005
@@ -2187,7 +2187,7 @@
 		my($start, $end) = $sec_ts->($ctx, \@grp);
                 $i++;
                 ($next_cnt, @next_grp) = $group_iter->();
-                $last = 1 if $n && $i++ >= $n-1;
+                $last = 1 if $n && $i >= $n;
                 $last = 1 unless $next_cnt;
 		local $ctx->{current_timestamp} = $start;
 		local $ctx->{current_timestamp_end} = $end;
@@ -2204,7 +2204,7 @@
 		    return $ctx->error( $builder->errstr );
 		$res .= $out;
                 $first = 0;
-		last if $n && $i++ >= $n-1;
+		last if $last;
 	    }
 	} else {
 	    my $iter = MT::Entry->load_iter({ blog_id => $blog->id,
@@ -2229,7 +2229,7 @@
 	    while (my $entry = $iter->()) {
 		if ($group_end->($ctx, $entry) && @entries) {
                     $i++;
-		    $last = 1 if $n && $i >= $n-1;
+		    $last = 1 if $n && $i >= $n;
 		    &$build_archive_item(\@entries, { ArchiveListHeader => $first, ArchiveListFooter => $last } );
 		    @entries = ();                       ## clear the entry list
                     $first = 0;