diff --git a/src/block/manager.rs b/src/block/manager.rs
index a883f6e9..572bdadd 100644
--- a/src/block/manager.rs
+++ b/src/block/manager.rs
@@ -370,7 +370,7 @@ impl BlockManager {
 		prevent_compression: bool,
 		order_tag: Option<OrderTag>,
 	) -> Result<(), Error> {
-		let who = self.replication.storage_nodes(&hash);
+		let who = self.system.cluster_layout().current_storage_nodes_of(&hash);
 
 		let compression_level = self.compression_level.filter(|_| !prevent_compression);
 		let (header, bytes) = DataBlock::from_buffer(data, compression_level)
diff --git a/src/rpc/layout/helper.rs b/src/rpc/layout/helper.rs
index 44c826f9..1aaf855a 100644
--- a/src/rpc/layout/helper.rs
+++ b/src/rpc/layout/helper.rs
@@ -219,6 +219,11 @@ impl LayoutHelper {
 		ret
 	}
 
+	pub fn current_storage_nodes_of(&self, position: &Hash) -> Vec<Uuid> {
+		let ver = self.current();
+		ver.nodes_of(position, ver.replication_factor)
+	}
+
 	pub fn trackers_hash(&self) -> Hash {
 		self.trackers_hash
 	}