diff --git a/ChangeLog b/ChangeLog
index b00bbac01b..0a39754fa2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Sun Nov  6 21:46:59 2005  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
+
+	* ext/tk/stubs.c (ruby_tcl_create_ip_and_stubs_init): should touch
+	  interpreter after initialization is done. [ruby-dev:27638]
+
 Sun Nov  6 20:13:27 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* file.c (rb_file_s_readlink): readlink(2) on AIX fails with ERANGE if
diff --git a/ext/tk/stubs.c b/ext/tk/stubs.c
index 050333cf63..3fb3e5f2f3 100644
--- a/ext/tk/stubs.c
+++ b/ext/tk/stubs.c
@@ -237,14 +237,14 @@ ruby_tcl_create_ip_and_stubs_init(st)
             return (Tcl_Interp*)NULL;
         }
 
-        _nativethread_consistency_check(tcl_ip);
-
         if (!Tcl_InitStubs(tcl_ip, "8.1", 0)) {
             if (st) *st = FAIL_Tcl_InitStubs;
             (*p_Tcl_DeleteInterp)(tcl_ip);
             return (Tcl_Interp*)NULL;
         }
 
+        _nativethread_consistency_check(tcl_ip);
+
         return tcl_ip;
     }
 }