diff --git a/src/lib/SinglePromise.hx b/src/lib/SinglePromise.hx
index 9b92a32..d7c2d99 100644
--- a/src/lib/SinglePromise.hx
+++ b/src/lib/SinglePromise.hx
@@ -1,5 +1,7 @@
 package lib;
 
+import kernel.EndOfLoop;
+
 using tink.CoreApi;
 
 class SinglePromise<T> {
@@ -15,6 +17,7 @@ class SinglePromise<T> {
 
 	public function request():Promise<T> {
 		if (this.inProgress) {
+			trace("Is progress");
 			return this.interalPromise;
 		}
 
@@ -32,17 +35,21 @@ class SinglePromise<T> {
 		return this.interalPromise;
 	}
 
+	public function isRunning():Bool {
+		return this.inProgress;
+	}
+
 	public function resolve(val:T) {
 		if (this.inProgress) {
-			this.interalResolve(val);
 			this.inProgress = false;
+			this.interalResolve(val);
 		}
 	}
 
 	public function reject(err:Error) {
 		if (this.inProgress) {
-			this.interalReject(err);
 			this.inProgress = false;
+			this.interalReject(err);
 		}
 	}
 }
diff --git a/src/lib/SingleTimeoutPromise.hx b/src/lib/SingleTimeoutPromise.hx
index d7c4442..cb1d95f 100644
--- a/src/lib/SingleTimeoutPromise.hx
+++ b/src/lib/SingleTimeoutPromise.hx
@@ -42,19 +42,23 @@ class SingleTimeoutPromise<T> {
 		return this.interalPromise;
 	}
 
+	public function isRunning():Bool {
+		return this.inProgress;
+	}
+
 	public function resolve(val:T) {
 		if (this.inProgress) {
-			this.interalResolve(val);
 			this.inProgress = false;
 			this.timer.cancle();
+			this.interalResolve(val);
 		}
 	}
 
 	public function reject(err:Error) {
 		if (this.inProgress) {
-			this.interalReject(err);
 			this.inProgress = false;
 			this.timer.cancle();
+			this.interalReject(err);
 		}
 	}
 }