diff --git a/Mage.Tests/src/test/java/org/mage/test/commander/duel/CastCommanderTest.java b/Mage.Tests/src/test/java/org/mage/test/commander/duel/CastCommanderTest.java
index 4a948571b9e..4d5a3a7c868 100644
--- a/Mage.Tests/src/test/java/org/mage/test/commander/duel/CastCommanderTest.java
+++ b/Mage.Tests/src/test/java/org/mage/test/commander/duel/CastCommanderTest.java
@@ -39,7 +39,6 @@ import org.mage.test.serverside.base.CardTestCommanderDuelBase;
  */
 public class CastCommanderTest extends CardTestCommanderDuelBase {
     @Test
-    @Ignore
     public void testFirstAbility() {
         addCard(Zone.BATTLEFIELD, playerA, "Swamp", 5);
 
diff --git a/Mage/src/mage/game/GameCommanderImpl.java b/Mage/src/mage/game/GameCommanderImpl.java
index b5e4fae424f..42d3ac77ef8 100644
--- a/Mage/src/mage/game/GameCommanderImpl.java
+++ b/Mage/src/mage/game/GameCommanderImpl.java
@@ -83,9 +83,10 @@ public abstract class GameCommanderImpl extends GameImpl {
             if (player != null){
                 if (player.getSideboard().size() > 0){
                     Card commander =  getCard((UUID)player.getSideboard().toArray()[0]);
-                    if (commander != null) {
+                    if (commander != null) {                        
                         player.setCommanderId(commander.getId());
                         commander.moveToZone(Zone.COMMAND, null, this, true);
+                        commander.getAbilities().setControllerId(player.getId());
                         ability.addEffect(new CommanderReplacementEffect(commander.getId(), alsoHand, alsoLibrary));
                         ability.addEffect(new CommanderCostModification(commander.getId()));
                         ability.addEffect(new CommanderManaReplacementEffect(player.getId(), CardUtil.getColorIdentity(commander)));
diff --git a/Mage/src/mage/players/PlayerImpl.java b/Mage/src/mage/players/PlayerImpl.java
index f5cc42cb979..ef6a0004790 100644
--- a/Mage/src/mage/players/PlayerImpl.java
+++ b/Mage/src/mage/players/PlayerImpl.java
@@ -2454,7 +2454,7 @@ public abstract class PlayerImpl implements Player, Serializable {
             for (CommandObject commandObject : game.getState().getCommand()) {
                 for (ActivatedAbility ability : commandObject.getAbilities().getActivatedAbilities(Zone.COMMAND)) {
                     if (ability.getControllerId().equals(getId())
-                            && ability.getAbilityType().equals(AbilityType.ACTIVATED)
+                            && ability instanceof ActivatedAbility
                             && canPlay(ability, availableMana, game.getObject(ability.getSourceId()), game)) {
                         playableActivated.put(ability.toString(), ability);
                     }