diff --git a/Dev Builds/Korra.jar b/Dev Builds/Korra.jar
index 7706effc..ba1d0b32 100644
Binary files a/Dev Builds/Korra.jar and b/Dev Builds/Korra.jar differ
diff --git a/src/com/projectkorra/ProjectKorra/waterbending/FreezeMelt.java b/src/com/projectkorra/ProjectKorra/waterbending/FreezeMelt.java
index 17e165db..216cc39c 100644
--- a/src/com/projectkorra/ProjectKorra/waterbending/FreezeMelt.java
+++ b/src/com/projectkorra/ProjectKorra/waterbending/FreezeMelt.java
@@ -91,10 +91,7 @@ public class FreezeMelt {
 	public static boolean canThaw(Block block) {
 		if (frozenblocks.containsKey(block)) {
 			for (Player player : block.getWorld().getPlayers()) {
-				if (Methods.getBoundAbility(player) == null) {
-					return true;
-				}
-				if (Methods.getBoundAbility(player).equalsIgnoreCase("OctopusForm")) {
+				if (Methods.getBoundAbility(player) != null && Methods.getBoundAbility(player).equalsIgnoreCase("OctopusForm")) {
 					if (block.getLocation().distance(player.getLocation()) <= OctopusForm.radius + 2)
 						return false;
 				}