diff --git a/src/jio.storage/gidstorage.js b/src/jio.storage/gidstorage.js
index 4cb4ebbe6f841b40a92810208dc9026ed9d0c97d..a601387632a4ef1808384fca723b95efc7d01005 100644
--- a/src/jio.storage/gidstorage.js
+++ b/src/jio.storage/gidstorage.js
@@ -387,7 +387,7 @@
     that.get = function (command) {
       setTimeout(function () {
         var gid_object, complex_query;
-        gid_object = gidParse(command.cloneDoc()._id, priv.constraints);
+        gid_object = gidParse(command.getDocId(), priv.constraints);
         if (gid_object === undefined) {
           return that.error({
             "status": 400,
@@ -412,6 +412,7 @@
               "reason": "missing"
             });
           }
+          response.rows[0].doc._id = command.getDocId();
           return that.success(response.rows[0].doc);
         }, function (err) {
           err.message = "Cannot get document";