diff --git a/tarantool/src/main/java/com/yahoo/ycsb/db/TarantoolClient.java b/tarantool/src/main/java/com/yahoo/ycsb/db/TarantoolClient.java
index 6d954ad2c4..aa26b13b74 100644
--- a/tarantool/src/main/java/com/yahoo/ycsb/db/TarantoolClient.java
+++ b/tarantool/src/main/java/com/yahoo/ycsb/db/TarantoolClient.java
@@ -92,7 +92,7 @@ public int insert(String table, String key, HashMap<String, ByteIterator> values
 			j += 2;
 		}
 		try {
-			this.connection.insert(this.spaceNo, tuple);
+			this.connection.replace(this.spaceNo, tuple);
 		} catch (TarantoolException exc) {
 			logger.log(Level.SEVERE,"Can't insert element", exc);
 			return 1;
@@ -131,7 +131,7 @@ public int read(String table, String key, Set<String> fields,
 	public int scan(String table, String startkey,
 			int recordcount, Set<String> fields,
 			Vector<HashMap<String, ByteIterator>> result) {
-		List<String> response;
+		List<List<String>> response;
 		try {
 			response = this.connection.select(this.spaceNo, 0, Arrays.asList(startkey), 0, recordcount, 6);
 		} catch (TarantoolException exc) {
@@ -140,9 +140,11 @@ public int scan(String table, String startkey,
 		} catch (NullPointerException exc) {
 			return 1;
 		}
-		HashMap<String, ByteIterator> temp = tuple_convert_filter(response, fields);
-		if (!temp.isEmpty())
-			result.add((HashMap<String, ByteIterator>) temp.clone());
+		for(List<String> i: response) {
+			HashMap<String, ByteIterator> temp = tuple_convert_filter(i, fields);
+			if (!temp.isEmpty())
+				result.add((HashMap<String, ByteIterator>) temp.clone());
+		}
 		return 0;
 	}