Index: src/org/python/core/ThreadStateMapping.java
===================================================================
--- src/org/python/core/ThreadStateMapping.java	(revision 7116)
+++ src/org/python/core/ThreadStateMapping.java	(working copy)
@@ -35,6 +35,7 @@
             ts = new ThreadState(t, newSystemState);
 
             newSystemState.registerThreadState(threadLocal, ts);
+            threadLocal[0] = ts;
             return ts;
         }
     }