diff --git a/lib/storage/metadata/mongoclient/MongoClientInterface.js b/lib/storage/metadata/mongoclient/MongoClientInterface.js
index c2844b214..bc45d0a02 100644
--- a/lib/storage/metadata/mongoclient/MongoClientInterface.js
+++ b/lib/storage/metadata/mongoclient/MongoClientInterface.js
@@ -479,7 +479,9 @@ class MongoClientInterface {
         const m = this.getCollection(METASTORE);
         m.findOneAndDelete({
             _id: bucketName,
-        } , {includeResultMetadata: true}, {})
+        } , {
+            includeResultMetadata: true
+        }, {})
             .then(result => {
                 if (result.ok !== 1) {
                     log.error('deleteBucketStep2: failed deleting bucket');
@@ -1298,9 +1300,8 @@ class MongoClientInterface {
             _id: masterKey,
             value: objVal,
         }, {
+            includeResultMetadata: true,
             upsert: true,
-        }, {
-            includeResultMetadata: true
         }).then(result => {
             if (result.ok !== 1) {
                 log.error('repair: failed trying to repair value');
@@ -2629,10 +2630,9 @@ class MongoClientInterface {
                     value: objVal,
                 },
             }, {
+                includeResultMetadata: true,
                 upsert: true,
-            }, {
-                includeResultMetadata: true
-            }).then(res => {
+            },).then(res => {
                 if (res.ok !== 1) {
                     log.error('failed to update object', {
                         method,