diff --git a/src/cz/boosik/boosCooldown/boosWarmUpManager.java b/src/cz/boosik/boosCooldown/boosWarmUpManager.java
index 16c9c32..b60500e 100644
--- a/src/cz/boosik/boosCooldown/boosWarmUpManager.java
+++ b/src/cz/boosik/boosCooldown/boosWarmUpManager.java
@@ -75,10 +75,18 @@ public class boosWarmUpManager {
 		Iterator<String> iter = playercommands.keySet().iterator();
 		while (iter.hasNext()) {
 			if (iter.next().startsWith(player.getName() + "@")) {
+				killTimer(player);
 				iter.remove();
 			}
 		}
 	}
+	public static void killTimer(Player player) {
+	for (String key : playercommands.keySet()) {
+		if (key.startsWith(player.getName() + "@")) {
+			playercommands.get(key).cancel();
+		}
+	}
+	}
 	
 	public static boolean hasWarmUps(Player player) {
 		for (String key : playercommands.keySet()) {