diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/activity/DebugInterface.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/activity/DebugInterface.java
index 86f8f399d..bc831c202 100644
--- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/activity/DebugInterface.java
+++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/activity/DebugInterface.java
@@ -42,7 +42,7 @@ public final class DebugInterface {
 			/*,new DebugButton("dmg=1", new OnClickListener() {
 	    		@Override
 				public void onClick(View arg0) {
-	    			world.model.player.traits.damagePotential.set(1, 1);
+	    			world.model.player.traits.combatTraits.set(1, 1);
 	    			mainActivity.updateStatus();
 	    			mainActivity.showToast("DEBUG: damagePotential=1", Toast.LENGTH_SHORT);
 				}
diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/CombatController.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/CombatController.java
index bb79f1e00..32cbf02ed 100644
--- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/CombatController.java
+++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/CombatController.java
@@ -172,8 +172,8 @@ public final class CombatController implements VisualEffectCompletedCallback {
 	private Monster currentlyAttackedMonster;
 	private AttackResult lastAttackResult;
 	private void executePlayerAttack() {
-		if (!useAPs(model.player.combatTraits.attackCost)) return;
 		if (context.effectController.isRunningVisualEffect()) return;
+		if (!useAPs(model.player.combatTraits.attackCost)) return;
 		final Monster target = model.uiSelections.selectedMonster;
 		this.currentlyAttackedMonster = target;