--- CBOR-XS/XS.xs	2014/01/05 14:24:54	1.43
+++ CBOR-XS/XS.xs	2015/04/27 20:21:53	1.47
@@ -9,6 +9,7 @@
 #include <limits.h>
 #include <float.h>
 
+#define ECB_NO_THREADS 1
 #include "ecb.h"
 
 // compatibility with perl <5.18
@@ -325,11 +326,18 @@
 
   encode_uint (enc, MAJOR_ARRAY, len + 1);
 
-  for (i = 0; i <= len; ++i)
-    {
-      SV **svp = av_fetch (av, i, 0);
-      encode_sv (enc, svp ? *svp : &PL_sv_undef);
-    }
+  if (SvMAGICAL (av))
+    for (i = 0; i <= len; ++i)
+      {
+        SV **svp = av_fetch (av, i, 0);
+        encode_sv (enc, svp ? *svp : &PL_sv_undef);
+      }
+  else
+    for (i = 0; i <= len; ++i)
+      {
+        SV *sv = AvARRAY (av)[i];
+        encode_sv (enc, sv ? sv : &PL_sv_undef);
+      }
 
   --enc->depth;
 }
@@ -1258,6 +1266,10 @@
 
           switch (major)
             {
+              case MAJOR_TAG     >> MAJOR_SHIFT:
+                ++count; // tags merely prefix another value
+                break;
+
               case MAJOR_BYTES   >> MAJOR_SHIFT:
               case MAJOR_TEXT    >> MAJOR_SHIFT:
               case MAJOR_ARRAY   >> MAJOR_SHIFT: