diff --git a/lib/js/thrift.js b/lib/js/thrift.js
index dc74eb6..4d66861 100644
--- a/lib/js/thrift.js
+++ b/lib/js/thrift.js
@@ -377,7 +377,7 @@
 
         this.tstack[p][this.tstack[p].length-1] = size;
         
-        var map   = "{"
+        var map = "}"
         var first = true
         while( this.tstack.length > p+1 ){
             var v = this.tstack.pop()
@@ -385,12 +385,12 @@
             if(first){
                 first = false
             }else{
-                map += ","
+                map = "," + map
             }
             
-            map  += '"'+k+'":'+v
+            map = '"'+k+'":'+v + map
         }
-        map += "}"
+        map = "{" + map
         
         this.tstack[p].push(map)
         this.tstack[p] = "["+this.tstack[p].join(",")+"]"
@@ -687,6 +687,7 @@
            }
         } else {
             r["value"] = f
+            this.rstack.pop()
         }
         
         return r