diff --git a/class/core/public.py b/class/core/public.py
index f5d2367aa..5b53472c0 100755
--- a/class/core/public.py
+++ b/class/core/public.py
@@ -203,8 +203,8 @@ def returnData(status, msg, data=None):
 
 def returnJson(status, msg, data=None):
     if data == None:
-        return returnData(status, msg)
-    return returnData(status, msg, data)
+        return getJson({'status': status, 'msg': msg})
+    return getJson({'status': status, 'msg': msg, 'data': data})
 
 
 def returnMsg(status, msg, args=()):