--- ./lib/TWiki/Plugins/DBIQueryPlugin.pm.original	2007-09-20 12:01:56.000000000 +1000
+++ ./lib/TWiki/Plugins/DBIQueryPlugin.pm	2007-09-20 12:02:12.000000000 +1000
@@ -646,10 +646,6 @@
 
 	my $dbh = $query->{dbh} = db_connect($params->{_DEFAULT});
 
-	if (defined $query->{header}) {
-	    $result .= expandColumns($query->{header}, $columns);
-	}
-
 	my $statement = TWiki::Func::expandCommonVariables(
 	    expandColumns($query->{statement}, $columns),
 	    $topic,
@@ -665,6 +661,9 @@
 	while (my $row = $sth->fetchrow_hashref) {
 	    unless ($fetched) {
 		dprint "Columns: ", join(", ", keys %$row);
+		if (defined $query->{header}) {
+		    $result .= expandColumns($query->{header}, $columns);
+		}
 	    }
 	    $fetched++;