diff --git a/cli.py b/cli.py
index 93bcb76..8b8a28c 100644
--- a/cli.py
+++ b/cli.py
@@ -9,8 +9,10 @@ if __name__ == '__main__':
         nav = signer.navigator()
         res = {
             'status': 'ok',
-            'data': data,
-            'navigator': nav
+            'data': {
+                **data,
+                'navigator': nav
+            }
         }
         print(json.dumps(res))
         signer.cleanup()
diff --git a/web.py b/web.py
index 4aa629e..87ada31 100644
--- a/web.py
+++ b/web.py
@@ -16,10 +16,12 @@ class TikServer(BaseHTTPRequestHandler):
 
         res = {
             'status': 'ok',
-            'data': data,
-            'navigator': nav
+            'data': {
+                **data,
+                'navigator': nav
+            }
         }
-        
+
         self.send_response(200)
         self.send_header('Content-type', 'application/json')
         self.end_headers()