diff --git a/substreams/Cargo.lock b/substreams/Cargo.lock
index 1f4d8c6..c3164d5 100644
--- a/substreams/Cargo.lock
+++ b/substreams/Cargo.lock
@@ -210,7 +210,7 @@ dependencies = [
 
 [[package]]
 name = "ethereum-balancer"
-version = "0.2.0"
+version = "0.2.1"
 dependencies = [
  "anyhow",
  "bytes",
diff --git a/substreams/ethereum-balancer/Cargo.toml b/substreams/ethereum-balancer/Cargo.toml
index 9bc359a..8b9ba80 100644
--- a/substreams/ethereum-balancer/Cargo.toml
+++ b/substreams/ethereum-balancer/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "ethereum-balancer"
-version = "0.2.0"
+version = "0.2.1"
 edition = "2021"
 
 [lib]
diff --git a/substreams/ethereum-balancer/src/modules.rs b/substreams/ethereum-balancer/src/modules.rs
index f0e1abb..d85102d 100644
--- a/substreams/ethereum-balancer/src/modules.rs
+++ b/substreams/ethereum-balancer/src/modules.rs
@@ -90,10 +90,10 @@ pub fn map_relative_balances(
                     }
                 }
             } else if let Some(ev) = abi::vault::events::Swap::match_and_decode(vault_log.log) {
-                let component_id = format!("0x{}", hex::encode(&ev.pool_id[..20]));
+                let component_id = format!("0x{}", hex::encode(ev.pool_id));
 
                 if store
-                    .get_last(format!("pool:{}", component_id))
+                    .get_last(format!("pool:{}", &component_id[..42]))
                     .is_some()
                 {
                     deltas.extend_from_slice(&[
diff --git a/substreams/ethereum-balancer/substreams.yaml b/substreams/ethereum-balancer/substreams.yaml
index dfd8c30..0bbb66b 100644
--- a/substreams/ethereum-balancer/substreams.yaml
+++ b/substreams/ethereum-balancer/substreams.yaml
@@ -1,7 +1,7 @@
 specVersion: v0.1.0
 package:
   name: "ethereum_balancer"
-  version: v0.2.0
+  version: v0.2.1
 
 protobuf:
   files: