--- a/server/session.py	Mon Aug 17 11:06:43 2009 +0200
+++ b/server/session.py	Mon Aug 17 12:11:04 2009 +0200
@@ -330,7 +330,7 @@
         try:
             csession = self._threaddata.childsession
         except AttributeError:
-            if self.is_super_session:
+            if isinstance(self, (ChildSession, InternalSession)):
                 csession = self
             else:
                 csession = ChildSession(self)