diff --git a/src/me/simplicitee/project/addons/ProjectAddons.java b/src/me/simplicitee/project/addons/ProjectAddons.java
index 60059d8..645de01 100644
--- a/src/me/simplicitee/project/addons/ProjectAddons.java
+++ b/src/me/simplicitee/project/addons/ProjectAddons.java
@@ -276,9 +276,11 @@ private void setupConfig() {
 		c.addDefault("Abilities.Fire.CombustBeam.Minimum.Power", 0.6);
 		c.addDefault("Abilities.Fire.CombustBeam.Minimum.Angle", 0.2);
 		c.addDefault("Abilities.Fire.CombustBeam.Minimum.ChargeTime", 1000);
+		c.addDefault("Abilities.Fire.CombustBeam.Minimum.Damage", 2);
 		c.addDefault("Abilities.Fire.CombustBeam.Maximum.Power", 2.7);
 		c.addDefault("Abilities.Fire.CombustBeam.Maximum.Angle", 40);
 		c.addDefault("Abilities.Fire.CombustBeam.Maximum.ChargeTime", 5000);
+		c.addDefault("Abilities.Fire.CombustBeam.Maximum.Damage", 10);
 		c.addDefault("Abilities.Fire.CombustBeam.InterruptedDamage", 10);
 		c.addDefault("Abilities.Fire.CombustBeam.RevertTime", 13000);
 		
diff --git a/src/me/simplicitee/project/addons/ability/chi/NinjaStance.java b/src/me/simplicitee/project/addons/ability/chi/NinjaStance.java
index 9ad08b5..0704994 100644
--- a/src/me/simplicitee/project/addons/ability/chi/NinjaStance.java
+++ b/src/me/simplicitee/project/addons/ability/chi/NinjaStance.java
@@ -3,8 +3,6 @@
 import java.util.ArrayList;
 import java.util.List;
 
-import javax.swing.event.DocumentEvent.ElementChange;
-
 import org.bukkit.Location;
 import org.bukkit.Sound;
 import org.bukkit.entity.Player;
@@ -32,6 +30,11 @@ public class NinjaStance extends ChiAbility implements AddonAbility{
 
 	public NinjaStance(Player player) {
 		super(player);
+		
+		if (bPlayer.isOnCooldown(this)) {
+			return;
+		}
+		
 		ChiAbility stance = bPlayer.getStance();
 		if (stance != null) {
 			stance.remove();
@@ -113,6 +116,12 @@ public void progress() {
 		player.addPotionEffects(effects);
 	}
 
+	@Override
+	public void remove() {
+		super.remove();
+		bPlayer.addCooldown(this);
+	}
+	
 	@Override
 	public String getAuthor() {
 		return "Simplicitee";