diff --git a/src/com/projectkorra/ProjectKorra/Ability/AbilityModuleManager.java b/src/com/projectkorra/ProjectKorra/Ability/AbilityModuleManager.java
index b1aee30a..ddeccd37 100644
--- a/src/com/projectkorra/ProjectKorra/Ability/AbilityModuleManager.java
+++ b/src/com/projectkorra/ProjectKorra/Ability/AbilityModuleManager.java
@@ -88,7 +88,6 @@ public class AbilityModuleManager {
 					if (a == StockAbilities.Torrent) shiftabilities.add(a.name());
 					if (a == StockAbilities.WaterManipulation) shiftabilities.add(a.name());
 					if (a == StockAbilities.IceSpike) shiftabilities.add(a.name());
-					if (a == StockAbilities.WaterSpout) shiftabilities.add(a.name());
 				}
 			}
 			else if (StockAbilities.isEarthbending(a)) {
diff --git a/src/com/projectkorra/ProjectKorra/waterbending/WaterPassive.java b/src/com/projectkorra/ProjectKorra/waterbending/WaterPassive.java
index fff41051..dc130f49 100644
--- a/src/com/projectkorra/ProjectKorra/waterbending/WaterPassive.java
+++ b/src/com/projectkorra/ProjectKorra/waterbending/WaterPassive.java
@@ -28,11 +28,15 @@ public class WaterPassive {
 		for (Player player: Bukkit.getServer().getOnlinePlayers()) {
 			String ability = Methods.getBoundAbility(player);
 			if (Methods.canBendPassive(player.getName(), Element.Water)) {
-				if (ability == null || !AbilityModuleManager.shiftabilities.contains(ability)) {
+				if (WaterSpout.instances.containsKey(player)) {
+					continue;
+				}
+				else if (ability == null || !AbilityModuleManager.shiftabilities.contains(ability)) {
 					if (player.isSneaking() && Methods.isWater(player.getLocation().getBlock())) {
 						player.setVelocity(player.getEyeLocation().getDirection().clone().normalize().multiply(swimFactor));
 					}
 				}
+				
 //				if (player.getLocation().getBlock().isLiquid()) {
 //					for (Block block: Methods.getBlocksAroundPoint(player.getLocation(), 2)) {
 //						if (Methods.isAdjacentToThreeOrMoreSources(block) && Methods.isWater(block) && !tempHaltPassive.contains(player.getName())) {
diff --git a/src/plugin.yml b/src/plugin.yml
index 8afaa4c0..7f487094 100644
--- a/src/plugin.yml
+++ b/src/plugin.yml
@@ -1,6 +1,6 @@
 name: ProjectKorra
 author: ProjectKorra
-version: 1.2.0 BETA 14
+version: 1.2.0 BETA 15
 main: com.projectkorra.ProjectKorra.ProjectKorra
 commands:
   projectkorra: