diff --git a/src/test/java/org/syndicate_lang/actors/example/example2/Forwarder.java b/src/test/java/org/syndicate_lang/actors/example/example2/Forwarder.java
index 688dd6a..a7a19e9 100644
--- a/src/test/java/org/syndicate_lang/actors/example/example2/Forwarder.java
+++ b/src/test/java/org/syndicate_lang/actors/example/example2/Forwarder.java
@@ -4,27 +4,23 @@ import java.util.List;
 // import java.util.Random;
 
 public class Forwarder implements IForwarder {
-    private final int _index;
-    private final List<IForwarder> _actors;
     private final IForwarder _main;
-    private final int _nActors;
     private final int _nRounds;
-    // private final Random _random;
+    private IForwarder _peer = null;
 
-    public Forwarder(int index, List<IForwarder> actors, IForwarder main, int nActors, int nRounds) {
-        this._index = index;
-        this._actors = actors;
+    public Forwarder(IForwarder main, int nRounds) {
         this._main = main;
-        this._nActors = nActors;
         this._nRounds = nRounds;
-        // this._random = new Random();
+    }
+
+    @Override
+    public void setPeer(IForwarder peer) {
+        this._peer = peer;
     }
 
     @Override
     public void handleMessage(int hopCount) {
-        int index = (this._index + 1) % this._nActors;
-        // int index = _random.nextInt(this._nActors);
-        IForwarder target = hopCount >= this._nRounds - 1 ? _main : this._actors.get(index);
+        IForwarder target = hopCount >= this._nRounds - 1 ? _main : _peer;
         target.handleMessage(hopCount + 1);
     }
 }
diff --git a/src/test/java/org/syndicate_lang/actors/example/example2/IForwarder.java b/src/test/java/org/syndicate_lang/actors/example/example2/IForwarder.java
index 98bf62d..8b7d0bd 100644
--- a/src/test/java/org/syndicate_lang/actors/example/example2/IForwarder.java
+++ b/src/test/java/org/syndicate_lang/actors/example/example2/IForwarder.java
@@ -3,5 +3,6 @@ package org.syndicate_lang.actors.example.example2;
 import org.syndicate_lang.actors.Actor;
 
 public interface IForwarder {
+    void setPeer(IForwarder peer);
     void handleMessage(int hopCount);
 }
diff --git a/src/test/java/org/syndicate_lang/actors/example/example2/Main.java b/src/test/java/org/syndicate_lang/actors/example/example2/Main.java
index c88fb1e..6088a39 100644
--- a/src/test/java/org/syndicate_lang/actors/example/example2/Main.java
+++ b/src/test/java/org/syndicate_lang/actors/example/example2/Main.java
@@ -31,14 +31,24 @@ public class Main implements IForwarder {
         Actor.log().info("Available processors: " + Runtime.getRuntime().availableProcessors());
         List<IForwarder> _actors = new ArrayList<>();
         final IForwarder me = Actor.ref(this).asyncProxy(IForwarder.class);
+        IForwarder previous = null;
         for (int i = 0; i < _nActors; i++) {
-            Remote<IForwarder> a = Actor.forObject(new Forwarder(i, _actors, me, this._nActors, this._nRounds));
+            Remote<IForwarder> a = Actor.forObject(new Forwarder(me, this._nRounds));
             a.getActor().link();
-            _actors.add(a.asyncProxy(IForwarder.class));
+            IForwarder current = a.asyncProxy(IForwarder.class);
+            _actors.add(current);
+            if (previous != null) current.setPeer(previous);
+            previous = current;
         }
+        _actors.get(0).setPeer(_actors.get(_nActors - 1));
         Actor.log().info("Start");
         this._startTime = System.currentTimeMillis();
-        _actors.forEach((a) -> a.handleMessage(0));
+        _actors.forEach(a -> a.handleMessage(0));
+    }
+
+    @Override
+    public void setPeer(IForwarder peer) {
+        // Do nothing.
     }
 
     @Override
@@ -46,7 +56,7 @@ public class Main implements IForwarder {
         this._remainingToReceive--;
         if (this._remainingToReceive == 0) {
             double delta = (System.currentTimeMillis() - this._startTime) / 1000.0;
-            long nMessages = _nActors * _nRounds;
+            long nMessages = (long) _nActors * (long) _nRounds;
             double hz = nMessages / delta;
             Actor.current().stop();
             Actor.log().info(String.format("Stop after %d messages; %.1f seconds, %.1f Hz",