diff --git a/src/com/projectkorra/projectkorra/PKListener.java b/src/com/projectkorra/projectkorra/PKListener.java
index e9985624..89ff4425 100644
--- a/src/com/projectkorra/projectkorra/PKListener.java
+++ b/src/com/projectkorra/projectkorra/PKListener.java
@@ -799,26 +799,19 @@ public class PKListener implements Listener {
 			if (bPlayer == null) {
 				return;
 			}
-
+			
 			if (bPlayer.hasElement(Element.EARTH) && event.getCause() == DamageCause.FALL) {
-				Shockwave shockwave = new Shockwave(player);
-				shockwave.fallShockwave();
+				new Shockwave(player, true);
 			}
 
-			if (bPlayer.hasElement(Element.AIR) && event.getCause() == DamageCause.FALL && bPlayer.canBendPassive(Element.AIR)) {
-				new Flight(player);
-				player.setAllowFlight(true);
+			if (!event.isCancelled() && bPlayer.hasElement(Element.AIR) && event.getCause() == DamageCause.FALL && bPlayer.canBendPassive(Element.AIR)) {
 				new AirBurst(player, true);
-				player.setFallDistance(0);
 				event.setDamage(0D);
 				event.setCancelled(true);
 			}
 
 			if (!event.isCancelled() && bPlayer.hasElement(Element.WATER) && event.getCause() == DamageCause.FALL && bPlayer.canBendPassive(Element.WATER)) {
 				if (WaterPassive.applyNoFall(player)) {
-					new Flight(player);
-					player.setAllowFlight(true);
-					player.setFallDistance(0);
 					event.setDamage(0D);
 					event.setCancelled(true);
 				}
@@ -826,9 +819,6 @@ public class PKListener implements Listener {
 
 			if (!event.isCancelled() && bPlayer.hasElement(Element.EARTH) && event.getCause() == DamageCause.FALL && bPlayer.canBendPassive(Element.EARTH)) {
 				if (EarthPassive.softenLanding(player)) {
-					new Flight(player);
-					player.setAllowFlight(true);
-					player.setFallDistance(0);
 					event.setDamage(0D);
 					event.setCancelled(true);
 				}
@@ -837,7 +827,6 @@ public class PKListener implements Listener {
 			if (!event.isCancelled() && bPlayer.hasElement(Element.CHI) && event.getCause() == DamageCause.FALL && bPlayer.canBendPassive(Element.CHI)) {
 				if (player.isSprinting()) {
 					event.setDamage(0);
-					event.setCancelled(true);
 				} else {
 					double initdamage = event.getDamage();
 					double newdamage = event.getDamage() * ChiPassive.getFallReductionFactor();
@@ -1369,7 +1358,7 @@ public class PKListener implements Listener {
 					new CollapseWall(player);
 				}
 				if (abil.equalsIgnoreCase("Shockwave")) {
-					new Shockwave(player);
+					new Shockwave(player, false);
 				}
 				if (abil.equalsIgnoreCase("EarthGrab")) {
 					new EarthGrab(player, false);
diff --git a/src/com/projectkorra/projectkorra/earthbending/Shockwave.java b/src/com/projectkorra/projectkorra/earthbending/Shockwave.java
index ef98c329..0d8a5f8c 100644
--- a/src/com/projectkorra/projectkorra/earthbending/Shockwave.java
+++ b/src/com/projectkorra/projectkorra/earthbending/Shockwave.java
@@ -17,7 +17,7 @@ public class Shockwave extends EarthAbility {
 	private double threshold;
 	private double range;
 
-	public Shockwave(Player player) {
+	public Shockwave(Player player, boolean fall) {
 		super(player);
 				
 		this.angle = Math.toRadians(getConfig().getDouble("Abilities.Earth.Shockwave.Angle"));
@@ -35,20 +35,24 @@ public class Shockwave extends EarthAbility {
 			return;
 		}
 		
+		if (fall) {
+			fallShockwave();
+		}
+		
 		start();
-		bPlayer.addCooldown(this);
 	}
 
 	public void fallShockwave() {
 		if (!bPlayer.canBendIgnoreCooldowns(this)) {
 			return;
-		} else if (player.getFallDistance() < threshold || !isEarthbendable(player.getLocation().add(0, -1, 0).getBlock())) {
+		} else if (player.getFallDistance() < threshold || !isEarthbendable(player.getLocation().clone().subtract(0, 1, 0).getBlock())) {
 			return;
-		} else if(bPlayer.isOnCooldown("Shockwave")) {
+		} else if (bPlayer.isOnCooldown("Shockwave")) {
 			return;
 		}
-
+		
 		areaShockwave();
+		bPlayer.addCooldown(this);
 		remove();
 	}