diff --git a/src/main/java/teetime/framework/AbstractStage.java b/src/main/java/teetime/framework/AbstractStage.java
index 22a467ce825cc1143fe1bc8ffb43c5fc4df57731..9ac7e9dfb07d623994b9b3997e6eccf72652d13a 100644
--- a/src/main/java/teetime/framework/AbstractStage.java
+++ b/src/main/java/teetime/framework/AbstractStage.java
@@ -270,12 +270,12 @@ public abstract class AbstractStage extends Stage {
 
 	@Override
 	protected void terminate() {
-		currentState = StageState.TERMINATING;
+		changeState(StageState.TERMINATING);
 	}
 
 	@Override
 	protected boolean shouldBeTerminated() {
-		return (currentState == StageState.TERMINATING);
+		return (getCurrentState() == StageState.TERMINATING);
 	}
 
 	@Override