diff --git a/src/main/java/noppes/npcs/controllers/data/action/Action.java b/src/main/java/noppes/npcs/controllers/data/action/Action.java
index f91d84f52..ea7ce9ca0 100644
--- a/src/main/java/noppes/npcs/controllers/data/action/Action.java
+++ b/src/main/java/noppes/npcs/controllers/data/action/Action.java
@@ -509,10 +509,6 @@ public class Action implements IAction {
         return before(manager.create(t));
     }
 
-    @Override
-    public IConditionalAction conditional(IConditionalAction after) {
-        return manager.schedule(after);
-    }
 
     ///////////////////////////////////////////////////
     ///////////////////////////////////////////////////
@@ -566,6 +562,11 @@ public class Action implements IAction {
     ///////////////////////////////////////////////////
     // Conditionals
 
+    @Override
+    public IConditionalAction conditional(IConditionalAction after) {
+        return manager.schedule(after);
+    }
+
     @Override
     public void conditional(IConditionalAction... actions) {
         for (IConditionalAction act : actions)
diff --git a/src/main/java/noppes/npcs/controllers/data/action/ActionQueue.java b/src/main/java/noppes/npcs/controllers/data/action/ActionQueue.java
index 6cd702771..e079d6d24 100644
--- a/src/main/java/noppes/npcs/controllers/data/action/ActionQueue.java
+++ b/src/main/java/noppes/npcs/controllers/data/action/ActionQueue.java
@@ -267,8 +267,6 @@ public class ActionQueue implements IActionQueue {
         if (!isWorking)
             return;
 
-        killWhenEmpty();
-
         if (!isParallel) {
             IAction current = getCurrentAction();
             if (current instanceof Action) {
@@ -290,6 +288,8 @@ public class ActionQueue implements IActionQueue {
                 }
             }
         }
+
+        killWhenEmpty();
     }
 
     protected void killWhenEmpty() {