--- JSON-XS/XS.xs	2007/07/26 11:33:35	1.56
+++ JSON-XS/XS.xs	2007/08/13 16:14:20	1.59
@@ -60,6 +60,14 @@
 #define expect_false(expr) expect ((expr) != 0, 0)
 #define expect_true(expr)  expect ((expr) != 0, 1)
 
+#ifdef USE_ITHREADS
+# define JSON_SLOW 1
+# define JSON_STASH (json_stash ? json_stash : gv_stashpv ("JSON::XS", 1))
+#else
+# define JSON_SLOW 0
+# define JSON_STASH json_stash
+#endif
+
 static HV *json_stash, *json_boolean_stash; // JSON::XS::
 static SV *json_true, *json_false;
 
@@ -480,7 +488,11 @@
 
   if (expect_false (SvOBJECT (sv)))
     {
-      if (SvSTASH (sv) == json_boolean_stash)
+      HV *stash = !JSON_SLOW || json_boolean_stash
+                  ? json_boolean_stash
+                  : gv_stashpv ("JSON::XS::Boolean", 1);
+
+      if (SvSTASH (sv) == stash)
         {
           if (SvIV (sv))
             encode_str (enc, "true", 4, 0);
@@ -502,7 +514,6 @@
 
               if (to_json)
                 {
-                  int count;
                   dSP;
 
                   ENTER; SAVETMPS; PUSHMARK (SP);
@@ -1363,6 +1374,11 @@
 
 PROTOTYPES: DISABLE
 
+void CLONE (...)
+	CODE:
+        json_stash         = 0;
+        json_boolean_stash = 0;
+
 void new (char *klass)
 	PPCODE:
 {
@@ -1370,7 +1386,7 @@
         SvPOK_only (pv);
         Zero (SvPVX (pv), 1, JSON);
         ((JSON *)SvPVX (pv))->flags = F_DEFAULT;
-        XPUSHs (sv_2mortal (sv_bless (newRV_noinc (pv), json_stash)));
+        XPUSHs (sv_2mortal (sv_bless (newRV_noinc (pv), JSON_STASH)));
 }
 
 void ascii (JSON *self, int enable = 1)