diff --git a/forge-game/src/main/java/forge/game/combat/CombatUtil.java b/forge-game/src/main/java/forge/game/combat/CombatUtil.java
index e64d682faf7..4e758170131 100644
--- a/forge-game/src/main/java/forge/game/combat/CombatUtil.java
+++ b/forge-game/src/main/java/forge/game/combat/CombatUtil.java
@@ -236,7 +236,7 @@ public class CombatUtil {
             // attacker got goaded by defender or defender is not player
             if (goadedByDefender || !(defender instanceof Player)) {
                 for (GameEntity ge : getAllPossibleDefenders(attacker.getController())) {
-                    if (!defender.equals(ge) && ge instanceof Player) {
+                    if (!ge.equals(defender) && ge instanceof Player) {
                         // found a player which does not goad that creature
                         // and creature can attack this player or planeswalker
                         if (!attacker.isGoadedBy((Player) ge) && !ge.hasKeyword("Creatures your opponents control attack a player other than you if able.") && canAttack(attacker, ge)) {
@@ -250,7 +250,7 @@ public class CombatUtil {
         // Quasi-goad logic for "Kardur, Doomscourge" etc. that isn't goad but behaves the same
         if (defender != null && defender.hasKeyword("Creatures your opponents control attack a player other than you if able.")) {
             for (GameEntity ge : getAllPossibleDefenders(attacker.getController())) {
-                if (!defender.equals(ge) && ge instanceof Player) {
+                if (!ge.equals(defender) && ge instanceof Player) {
                     if (!ge.hasKeyword("Creatures your opponents control attack a player other than you if able.") && canAttack(attacker, ge)) {
                         return false;
                     }
diff --git a/forge-game/src/main/java/forge/game/trigger/TriggerCounterAddedOnce.java b/forge-game/src/main/java/forge/game/trigger/TriggerCounterAddedOnce.java
index bc0453ae592..72078d31bf5 100644
--- a/forge-game/src/main/java/forge/game/trigger/TriggerCounterAddedOnce.java
+++ b/forge-game/src/main/java/forge/game/trigger/TriggerCounterAddedOnce.java
@@ -55,12 +55,6 @@ public class TriggerCounterAddedOnce extends Trigger {
      * @param runParams*/
     @Override
     public final boolean performTest(final Map<AbilityKey, Object> runParams) {
-        if (hasParam("FirstTime")) {
-            if (!(boolean) runParams.get(AbilityKey.FirstTime)) {
-                return false;
-            }
-        }
-
         if (hasParam("CounterType")) {
             final CounterType addedType = (CounterType) runParams.get(AbilityKey.CounterType);
             final String type = getParam("CounterType");
@@ -83,6 +77,12 @@ public class TriggerCounterAddedOnce extends Trigger {
             return false;
         }
 
+        if (hasParam("FirstTime")) {
+            if (!(boolean) runParams.get(AbilityKey.FirstTime)) {
+                return false;
+            }
+        }
+
         return true;
     }