diff --git a/json_server.js b/json_server.js
index 0c682d9..a4cc0d9 100644
--- a/json_server.js
+++ b/json_server.js
@@ -12,9 +12,21 @@ Drupal.toJson = function(v) {
       return '"'+ v +'"';
     case 'object':
       var output = "{";
+      var props = []
+
+      // Get list of all object properties
       for(i in v) {
-        output = output + i + ":" + Drupal.toJson(v[i]) + ",";
+        props.push(i);
+      }
+
+      // Process all object properties and add them to final string
+      for (var i = 0; i < props.length; i++) {
+        output = output + props[i] + ":" + Drupal.toJson(v[props[i]]);
+        if (props[i + 1]) {
+          output = output + ",";
+        }
       }
+
       output = output + "}";
       return output;
     default: