diff --git a/source/java/org/alfresco/repo/jscript/app/JSONConversionComponent.java b/source/java/org/alfresco/repo/jscript/app/JSONConversionComponent.java
index ec2e960e6b..ee48fb11d7 100644
--- a/source/java/org/alfresco/repo/jscript/app/JSONConversionComponent.java
+++ b/source/java/org/alfresco/repo/jscript/app/JSONConversionComponent.java
@@ -187,6 +187,16 @@ public class JSONConversionComponent
      */
     @SuppressWarnings("unchecked")
     public String toJSON(final NodeRef nodeRef, final boolean useShortQNames)
+    {
+        return toJSONObject(nodeRef, useShortQNames).toJSONString();
+    }
+    
+    /**
+     * Convert a node reference to a JSON object.  Selects the correct converter based on selection
+     * implementation.
+     */
+    @SuppressWarnings("unchecked")
+    public JSONObject toJSONObject(final NodeRef nodeRef, final boolean useShortQNames)
     {
         final JSONObject json = new JSONObject();
         
@@ -214,7 +224,7 @@ public class JSONConversionComponent
             }
         }    
         
-        return json.toJSONString();
+        return json;
     }
     
     /**
@@ -239,7 +249,7 @@ public class JSONConversionComponent
             NodeRef targetNodeRef = nodeInfo.getLinkNodeRef();
             if (targetNodeRef != null)
             {
-                rootJSONObject.put("linkedNode", toJSON(targetNodeRef, useShortQNames));
+                rootJSONObject.put("linkedNode", toJSONObject(targetNodeRef, useShortQNames));
             }
         }