diff --git a/src/main/java/teetime/framework/Analysis.java b/src/main/java/teetime/framework/Analysis.java
index cc143dcd7fd4fc9981719641e5b9dafe39b10e48..18b837878d895ab70fcb54564f8bec751ba71671 100644
--- a/src/main/java/teetime/framework/Analysis.java
+++ b/src/main/java/teetime/framework/Analysis.java
@@ -29,7 +29,6 @@ import teetime.framework.exceptionHandling.AbstractExceptionListener;
 import teetime.framework.exceptionHandling.IExceptionListenerFactory;
 import teetime.framework.exceptionHandling.IgnoringExceptionListenerFactory;
 import teetime.framework.signal.InitializingSignal;
-import teetime.framework.signal.StartingSignal;
 import teetime.framework.signal.ValidatingSignal;
 import teetime.framework.validation.AnalysisNotValidException;
 import teetime.util.Pair;
@@ -266,15 +265,13 @@ public final class Analysis<T extends AnalysisConfiguration> implements Uncaught
 
 	private void sendInitializingSignal() {
 		for (RunnableProducerStage runnable : producerRunnables) {
-			InitializingSignal signal = new InitializingSignal();
-			runnable.sendInitializingSignal(signal);
+			runnable.sendInitializingSignal();
 		}
 	}
 
 	private void sendStartingSignal() {
 		for (RunnableProducerStage runnable : producerRunnables) {
-			StartingSignal signal = new StartingSignal();
-			runnable.sendStartingSignal(signal);
+			runnable.sendStartingSignal();
 		}
 	}
 
diff --git a/src/main/java/teetime/framework/RunnableProducerStage.java b/src/main/java/teetime/framework/RunnableProducerStage.java
index 8275f07f3808bf1d07e36d57bc3543e6958d5a5c..14ce4563f46bd65d5bdb1f9af5b22baece3fe5a7 100644
--- a/src/main/java/teetime/framework/RunnableProducerStage.java
+++ b/src/main/java/teetime/framework/RunnableProducerStage.java
@@ -15,22 +15,27 @@
  */
 package teetime.framework;
 
+import java.util.concurrent.Semaphore;
+
 import teetime.framework.signal.InitializingSignal;
 import teetime.framework.signal.StartingSignal;
 import teetime.framework.signal.TerminatingSignal;
 
 final class RunnableProducerStage extends AbstractRunnableStage {
 
-	private boolean initArrived, startArrived;
+	private final Semaphore startSemaphore = new Semaphore(0);
+	private final Semaphore initSemaphore = new Semaphore(0);
 
 	public RunnableProducerStage(final Stage stage) {
 		super(stage);
 	}
 
 	@Override
-	protected void beforeStageExecution() {
+	protected void beforeStageExecution() throws InterruptedException {
 		waitForInitializingSignal();
+		this.stage.onSignal(new InitializingSignal(), null);
 		waitForStartingSignal();
+		this.stage.onSignal(new StartingSignal(), null);
 	}
 
 	@Override
@@ -44,25 +49,19 @@ final class RunnableProducerStage extends AbstractRunnableStage {
 		this.stage.onSignal(terminatingSignal, null);
 	}
 
-	public void sendInitializingSignal(final InitializingSignal signal) {
-		this.stage.onSignal(signal, null);
-		initArrived = true;
+	public void sendInitializingSignal() {
+		initSemaphore.release();
 	}
 
-	public void sendStartingSignal(final StartingSignal signal) {
-		this.stage.onSignal(signal, null);
-		startArrived = true;
+	public void sendStartingSignal() {
+		startSemaphore.release();
 	}
 
-	public void waitForInitializingSignal() {
-		while (!initArrived) {
-			Thread.yield();
-		}
+	public void waitForInitializingSignal() throws InterruptedException {
+		initSemaphore.acquire();
 	}
 
-	public void waitForStartingSignal() {
-		while (!startArrived) {
-			Thread.yield();
-		}
+	public void waitForStartingSignal() throws InterruptedException {
+		startSemaphore.acquire();
 	}
 }
diff --git a/src/test/java/teetime/framework/RunnableProducerStageTest.java b/src/test/java/teetime/framework/RunnableProducerStageTest.java
new file mode 100644
index 0000000000000000000000000000000000000000..db2fec7c3aa28d799204cc3a711fafc31e1c02e1
--- /dev/null
+++ b/src/test/java/teetime/framework/RunnableProducerStageTest.java
@@ -0,0 +1,28 @@
+package teetime.framework;
+
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+
+import org.junit.Test;
+
+public class RunnableProducerStageTest {
+
+	@Test
+	public void testInit() {
+		RunnableTestStage testStage = new RunnableTestStage();
+		RunnableProducerStage runnable = new RunnableProducerStage(testStage);
+		Thread thread = new Thread(runnable);
+		thread.start();
+		// Not running and not initialized
+		assertFalse(testStage.executed && testStage.initialized);
+		runnable.sendInitializingSignal();
+		// Not running, but initialized
+		assertFalse(testStage.executed && !testStage.initialized);
+		runnable.sendStartingSignal();
+
+		while (!testStage.shouldBeTerminated()) {
+			Thread.yield();
+		}
+		assertTrue(testStage.executed);
+	}
+}
diff --git a/src/test/java/teetime/framework/RunnableTestStage.java b/src/test/java/teetime/framework/RunnableTestStage.java
new file mode 100644
index 0000000000000000000000000000000000000000..034474a3a1ef81503f49f20d9d19f5a1aed7110c
--- /dev/null
+++ b/src/test/java/teetime/framework/RunnableTestStage.java
@@ -0,0 +1,25 @@
+package teetime.framework;
+
+
+class RunnableTestStage extends AbstractProducerStage<Object> {
+
+	boolean executed, initialized;
+
+	@Override
+	protected void executeStage() {
+		executed = true;
+		this.terminate();
+	}
+
+	@Override
+	protected void execute() {
+
+	}
+
+	@Override
+	public void onInitializing() throws Exception {
+		super.onInitializing();
+		initialized = true;
+	}
+
+}