diff --git a/buildnumber.properties b/buildnumber.properties
index 625fd556..4e0bbe2f 100644
--- a/buildnumber.properties
+++ b/buildnumber.properties
@@ -1,3 +1,3 @@
 #Build Number for ANT. Do not edit!
-#Fri May 16 15:29:27 CEST 2014
-build.number=856
+#Fri May 16 15:39:23 CEST 2014
+build.number=857
diff --git a/src/me/StevenLawson/TotalFreedomMod/Commands/Command_glist.java b/src/me/StevenLawson/TotalFreedomMod/Commands/Command_glist.java
index b25c3b5f..e86c0aad 100644
--- a/src/me/StevenLawson/TotalFreedomMod/Commands/Command_glist.java
+++ b/src/me/StevenLawson/TotalFreedomMod/Commands/Command_glist.java
@@ -108,8 +108,7 @@ public class Command_glist extends TFM_Command
                 for (String ip : ips)
                 {
                     TFM_BanManager.getInstance().unbanIp(ip);
-                    String[] ipParts = ip.split("\\.");
-                    TFM_BanManager.getInstance().unbanIp(ipParts[0] + "." + ipParts[1] + ".*.*");
+                    TFM_BanManager.getInstance().unbanIp(TFM_Util.getFuzzyIp(ip));
                 }
             }
             else
diff --git a/src/me/StevenLawson/TotalFreedomMod/Commands/Command_gtfo.java b/src/me/StevenLawson/TotalFreedomMod/Commands/Command_gtfo.java
index eab32cdf..3a3c8d64 100644
--- a/src/me/StevenLawson/TotalFreedomMod/Commands/Command_gtfo.java
+++ b/src/me/StevenLawson/TotalFreedomMod/Commands/Command_gtfo.java
@@ -76,12 +76,7 @@ public class Command_gtfo extends TFM_Command
         }
 
         // ban IP address:
-        String ip = player.getAddress().getAddress().getHostAddress();
-        String[] ipParts = ip.split("\\.");
-        if (ipParts.length == 4)
-        {
-            ip = String.format("%s.%s.*.*", ipParts[0], ipParts[1]);
-        }
+        String ip = TFM_Util.getFuzzyIp(player.getAddress().getAddress().getHostAddress());
         TFM_Util.bcastMsg(String.format("Banning: %s, IP: %s.", player.getName(), ip), ChatColor.RED);
 
         TFM_BanManager.getInstance().addIpBan(new TFM_Ban(ip, player.getName(), sender.getName(), null, reason));
diff --git a/src/me/StevenLawson/TotalFreedomMod/Listener/TFM_PlayerListener.java b/src/me/StevenLawson/TotalFreedomMod/Listener/TFM_PlayerListener.java
index d75c833a..48268584 100644
--- a/src/me/StevenLawson/TotalFreedomMod/Listener/TFM_PlayerListener.java
+++ b/src/me/StevenLawson/TotalFreedomMod/Listener/TFM_PlayerListener.java
@@ -714,15 +714,9 @@ public class TFM_PlayerListener implements Listener
         // Verify strict IP match
         if (TFM_AdminList.isSuperAdmin(player))
         {
-            if (TFM_BanManager.getInstance().isIpBanned(ip))
-            {
-                TFM_BanManager.getInstance().unbanIp(ip);
-            }
-
-            if (TFM_BanManager.getInstance().isUuidBanned(player.getUniqueId()))
-            {
-                TFM_BanManager.getInstance().unbanUuid(player.getUniqueId());
-            }
+            TFM_BanManager.getInstance().unbanIp(ip);
+            TFM_BanManager.getInstance().unbanIp(TFM_Util.getFuzzyIp(ip));
+            TFM_BanManager.getInstance().unbanUuid(player.getUniqueId());
 
             player.setOp(true);
 
diff --git a/src/me/StevenLawson/TotalFreedomMod/TFM_ServerInterface.java b/src/me/StevenLawson/TotalFreedomMod/TFM_ServerInterface.java
index bcb6fe44..4821d0b3 100644
--- a/src/me/StevenLawson/TotalFreedomMod/TFM_ServerInterface.java
+++ b/src/me/StevenLawson/TotalFreedomMod/TFM_ServerInterface.java
@@ -87,7 +87,7 @@ public class TFM_ServerInterface
         }
 
         // not safe to use TFM_Util.isSuperAdmin for player logging in because player.getAddress() will return a null until after player login.
-        boolean isAdmin;
+        final boolean isAdmin;
         if (server.getOnlineMode())
         {
             isAdmin = TFM_AdminList.getSuperUUIDs().contains(uuid);
diff --git a/src/me/StevenLawson/TotalFreedomMod/TFM_Util.java b/src/me/StevenLawson/TotalFreedomMod/TFM_Util.java
index 4bdd3f22..3cbecdb0 100644
--- a/src/me/StevenLawson/TotalFreedomMod/TFM_Util.java
+++ b/src/me/StevenLawson/TotalFreedomMod/TFM_Util.java
@@ -825,6 +825,17 @@ public class TFM_Util
         return match;
     }
 
+    public static String getFuzzyIp(String ip)
+    {
+        final String[] ipParts = ip.split("\\.");
+        if (ipParts.length == 4)
+        {
+            return String.format("%s.%s.*.*", ipParts[0], ipParts[1]);
+        }
+
+        return ip;
+    }
+
     public static int replaceBlocks(Location center, Material fromMaterial, Material toMaterial, int radius)
     {
         int affected = 0;