diff --git a/src/main/java/jota/model/Bundle.java b/src/main/java/jota/model/Bundle.java
index b580206..9f270c1 100644
--- a/src/main/java/jota/model/Bundle.java
+++ b/src/main/java/jota/model/Bundle.java
@@ -99,10 +99,13 @@ public class Bundle implements Comparable<Bundle> {
 
             int[] timestampTrits = Converter.trits(this.getTransactions().get(i).getTimestamp(), 27);
 
-            int[] currentIndexTrits = Converter.trits(i + (this.getTransactions().get(i).getCurrentIndex()), 27);
+            this.getTransactions().get(i).setCurrentIndex(i);
 
-            int[] lastIndexTrits = Converter.trits(this.getTransactions().get(i).getLastIndex() - 1, 27);
+            int[] currentIndexTrits = Converter.trits(this.getTransactions().get(i).getCurrentIndex(), 27);
 
+            this.getTransactions().get(i).setLastIndex(this.getTransactions().size() - 1);
+
+            int[] lastIndexTrits = Converter.trits(this.getTransactions().get(i).getLastIndex(), 27);
 
             int[] t = Converter.trits(this.getTransactions().get(i).getAddress() + Converter.trytes(valueTrits) + this.getTransactions().get(i).getTag() + Converter.trytes(timestampTrits) + Converter.trytes(currentIndexTrits) + Converter.trytes(lastIndexTrits));
             curl.absorb(t, 0, t.length);