diff --git a/src/main/java/teetime/stage/basic/distributor/dynamic/DynamicDistributor.java b/src/main/java/teetime/stage/basic/distributor/dynamic/DynamicDistributor.java
index ab49def6b3752c77a0875a9c10b86058526f534b..72cf755a31c17c10e58cee81ebcd5277446faabd 100644
--- a/src/main/java/teetime/stage/basic/distributor/dynamic/DynamicDistributor.java
+++ b/src/main/java/teetime/stage/basic/distributor/dynamic/DynamicDistributor.java
@@ -16,7 +16,7 @@ public class DynamicDistributor<T> extends Distributor<T> implements OutputPortR
 	protected final BlockingQueue<PortAction<DynamicDistributor<T>>> portActions;
 
 	public DynamicDistributor() {
-		portActions = PortActionHelper.createPortActionQueue();
+		this.portActions = PortActionHelper.createPortActionQueue();
 		addOutputPortRemovedListener(this);
 	}
 
diff --git a/src/test/java/teetime/stage/basic/merger/dynamic/ControlledMergerTest.java b/src/test/java/teetime/stage/basic/merger/dynamic/ControlledMergerTest.java
index 03cd01b445be36c717d31fb6820d4e2598337d48..2304e0faa89710ac5d8a5e53158c166426f6f7ed 100644
--- a/src/test/java/teetime/stage/basic/merger/dynamic/ControlledMergerTest.java
+++ b/src/test/java/teetime/stage/basic/merger/dynamic/ControlledMergerTest.java
@@ -25,13 +25,15 @@ public class ControlledMergerTest {
 
 	@Test
 	public void shouldWorkWithoutActionTriggers() throws Exception {
-		PortAction<DynamicMerger<Integer>> createAction = new DoNothingPortAction<Integer>();
-
 		List<Integer> inputNumbers = Arrays.asList(0, 1, 2, 3, 4);
+
 		@SuppressWarnings("unchecked")
-		List<PortAction<DynamicMerger<Integer>>> inputActions = Arrays.asList(createAction, createAction, createAction, createAction, createAction);
+		PortAction<DynamicMerger<Integer>>[] inputActions = new PortAction[5];
+		for (int i = 0; i < inputActions.length; i++) {
+			inputActions[i] = new DoNothingPortAction<Integer>();
+		}
 
-		ControlledMergerTestConfig<Integer> config = new ControlledMergerTestConfig<Integer>(inputNumbers, inputActions);
+		ControlledMergerTestConfig<Integer> config = new ControlledMergerTestConfig<Integer>(inputNumbers, Arrays.asList(inputActions));
 		Execution<ControlledMergerTestConfig<Integer>> analysis = new Execution<ControlledMergerTestConfig<Integer>>(config,
 				new TerminatingExceptionListenerFactory());