diff --git a/src/main/java/teetime/framework/AbstractStage.java b/src/main/java/teetime/framework/AbstractStage.java
index 944df4021f781b44ee69921da014babaf75568a2..666863efdd79b3e1e053be14d591dd84aaf8aea9 100644
--- a/src/main/java/teetime/framework/AbstractStage.java
+++ b/src/main/java/teetime/framework/AbstractStage.java
@@ -33,7 +33,7 @@ public abstract class AbstractStage extends Stage {
 
 	private InputPort<?>[] inputPorts = new InputPort<?>[0];
 	private OutputPort<?>[] outputPorts = new OutputPort<?>[0];
-	private StageState currentState = StageState.NOT_INITIALIZED;
+	private StageState currentState = StageState.CREATED;
 
 	@Override
 	public InputPort<?>[] getInputPorts() {
diff --git a/src/main/java/teetime/framework/StageState.java b/src/main/java/teetime/framework/StageState.java
index 45388ce549750ed6a695f650b74da8ebbd8b1d6a..6cae9b37e71016c1154b574d2919cbabdd590fa4 100644
--- a/src/main/java/teetime/framework/StageState.java
+++ b/src/main/java/teetime/framework/StageState.java
@@ -17,9 +17,8 @@ package teetime.framework;
 
 public enum StageState {
 
-	NOT_INITIALIZED,
-	INITIALIZED,
 	CREATED,
+	INITIALIZED,
 	VALIDATING, VALIDATED,
 	STARTING, STARTED,
 	TERMINATING, TERMINATED