--- twiki/lib/TWiki.pm.distrib	2012-01-15 06:53:39.000000000 +0100
+++ twiki/lib/TWiki.pm	2012-03-29 15:49:01.000000000 +0200
@@ -2240,6 +2240,11 @@
         }
         my $meta;
         ( $meta, $text ) = $this->{store}->readTopic( $this->{user}, $web, $topic );
+
+        # 20120329 gertjan at west dot nl:
+        #   Handle common tags, as the text may contain variables etc. that need
+        #   to be expanded before generating the TOC for another topic.
+	$text = $this->handleCommonTags( $text, $web, $topic, $meta );
     }
 
     my $insidePre = 0;