diff --git a/pom.xml b/pom.xml
index 38ff62c..5535dd6 100644
--- a/pom.xml
+++ b/pom.xml
@@ -3,7 +3,7 @@
    <modelVersion>4.0.0</modelVersion>
    <groupId>net.goldtreeservers</groupId>
    <artifactId>worldguardextraflags</artifactId>
-   <version>2.14.2</version>
+   <version>2.14.3</version>
    <name>WorldGuardExtraFlags</name>
    <build>
       <finalName>WorldGuardExtraFlagsPlugin</finalName>
diff --git a/src/main/java/net/goldtreeservers/worldguardextraflags/flags/handlers/CommandOnEntryFlag.java b/src/main/java/net/goldtreeservers/worldguardextraflags/flags/handlers/CommandOnEntryFlag.java
index 5d66f65..7dac8b3 100644
--- a/src/main/java/net/goldtreeservers/worldguardextraflags/flags/handlers/CommandOnEntryFlag.java
+++ b/src/main/java/net/goldtreeservers/worldguardextraflags/flags/handlers/CommandOnEntryFlag.java
@@ -47,28 +47,11 @@ public class CommandOnEntryFlag extends Handler
 
 			for(Set<String> commands_ : commands)
 			{
-				if (!this.lastCommands.contains(commands_))
+				if (!this.lastCommands.contains(commands_) && commands_.size() > 0)
 				{
-					boolean isOp = player.isOp();
-					
-					try
+					for(String command : commands_)
 					{
-						if (!isOp)
-						{
-							player.setOp(true);
-						}
-						
-						for(String command : commands_)
-						{
-							WorldGuardExtraFlagsPlugin.getPlugin().getServer().dispatchCommand(player, command.substring(1).replace("%username%", player.getName())); //TODO: Make this better
-						}
-					}
-					finally
-					{
-						if (!isOp)
-						{
-							player.setOp(isOp);
-						}
+						WorldGuardExtraFlagsPlugin.getPlugin().getServer().dispatchCommand(player, command.substring(1).replace("%username%", player.getName())); //TODO: Make this better
 					}
 					
 					break;
diff --git a/src/main/java/net/goldtreeservers/worldguardextraflags/flags/handlers/CommandOnExitFlag.java b/src/main/java/net/goldtreeservers/worldguardextraflags/flags/handlers/CommandOnExitFlag.java
index f2d7c28..2116b51 100644
--- a/src/main/java/net/goldtreeservers/worldguardextraflags/flags/handlers/CommandOnExitFlag.java
+++ b/src/main/java/net/goldtreeservers/worldguardextraflags/flags/handlers/CommandOnExitFlag.java
@@ -65,31 +65,12 @@ public class CommandOnExitFlag extends Handler
 			
 			for(Set<String> commands_ : this.lastCommands)
 			{
-				if (!commands.contains(commands_))
+				if (!commands.contains(commands_) && commands_.size() > 0)
 				{
-					boolean isOp = player.isOp();
-					
-					try
+					for(String command : commands_)
 					{
-						if (!isOp)
-						{
-							player.setOp(true);
-						}
-						
-						for(String command : commands_)
-						{
-							WorldGuardExtraFlagsPlugin.getPlugin().getServer().dispatchCommand(player, command.substring(1).replace("%username%", player.getName())); //TODO: Make this better
-						}
+						WorldGuardExtraFlagsPlugin.getPlugin().getServer().dispatchCommand(player, command.substring(1).replace("%username%", player.getName())); //TODO: Make this better
 					}
-					finally
-					{
-						if (!isOp)
-						{
-							player.setOp(isOp);
-						}
-					}
-
-					break;
 				}
 			}
 			
diff --git a/src/main/resources/plugin.yml b/src/main/resources/plugin.yml
index 1ddf27b..d078ce2 100644
--- a/src/main/resources/plugin.yml
+++ b/src/main/resources/plugin.yml
@@ -1,5 +1,5 @@
 name: WorldGuardExtraFlags
-version: 2.14.2
+version: 2.14.3
 description: Adds more flags to worldguard to help manage your server easily!
 author: isokissa3
 website: https://goldtreevers.net