diff --git a/src/database/mongo/main.js b/src/database/mongo/main.js
index 509f19006b..7e220f5e5c 100644
--- a/src/database/mongo/main.js
+++ b/src/database/mongo/main.js
@@ -83,8 +83,9 @@ module.exports = function (db, module) {
 		if (!key) {
 			return callback();
 		}
-		db.collection('objects').findAndModify({ _key: key }, {}, { $inc: { value: 1 } }, { new: true, upsert: true }, function (err, result) {
-			callback(err, result && result.value ? result.value.value : null);
+		db.collection('objects').findAndModify({ _key: key }, {}, { $inc: { data: 1 } }, { new: true, upsert: true }, function (err, result) {
+			console.log(result)
+			callback(err, result && result.value ? result.value.data : null);
 		});
 	};
 
diff --git a/test/database/keys.js b/test/database/keys.js
index 03d607d808..cdd8cc9ab4 100644
--- a/test/database/keys.js
+++ b/test/database/keys.js
@@ -149,6 +149,21 @@ describe('Key methods', function () {
 				done();
 			});
 		});
+
+		it('should set then increment a key', function (done) {
+			db.set('myIncrement', 1, function (err) {
+				assert.ifError(err);
+				db.increment('myIncrement', function (err, value) {
+					assert.ifError(err);
+					assert.equal(value, 2);
+					db.get('myIncrement', function (err, value) {
+						assert.ifError(err);
+						assert.equal(value, 2);
+						done();
+					});
+				});
+			});
+		});
 	});
 
 	describe('rename', function () {