diff --git a/Mage.Sets/src/mage/cards/g/GuidelightMatrix.java b/Mage.Sets/src/mage/cards/g/GuidelightMatrix.java
index 93b938c91c3..42fd69c618a 100644
--- a/Mage.Sets/src/mage/cards/g/GuidelightMatrix.java
+++ b/Mage.Sets/src/mage/cards/g/GuidelightMatrix.java
@@ -41,9 +41,8 @@ public final class GuidelightMatrix extends CardImpl {
         // When this artifact enters, draw a card.
         this.addAbility(new EntersBattlefieldTriggeredAbility(new DrawCardSourceControllerEffect(1)));
         // {2}, {T}: Target Mount you control becomes saddled until end of turn. Activate only as a sorcery.
-        Ability saddledAbility = new ActivateAsSorceryActivatedAbility(new SaddleTargetMountEffect(),
-                new CompositeCost(new ManaCostsImpl<>("{2}"), new TapSourceCost(), "{2}, {T}")
-        );
+        Ability saddledAbility = new ActivateAsSorceryActivatedAbility(new SaddleTargetMountEffect(), new ManaCostsImpl<>("{2}"));
+        saddledAbility.addCost(new TapSourceCost());
         saddledAbility.addTarget(new TargetPermanent(mountFilter));
         this.addAbility(saddledAbility);
         // {2}, {T}: Target Vehicle you control becomes an artifact creature until end of turn.
diff --git a/Mage/src/main/java/mage/abilities/effects/common/SaddleTargetMountEffect.java b/Mage/src/main/java/mage/abilities/effects/common/SaddleTargetMountEffect.java
index 66de8d61eef..e32f6036408 100644
--- a/Mage/src/main/java/mage/abilities/effects/common/SaddleTargetMountEffect.java
+++ b/Mage/src/main/java/mage/abilities/effects/common/SaddleTargetMountEffect.java
@@ -34,11 +34,7 @@ public class SaddleTargetMountEffect extends OneShotEffect {
 
     @Override
     public boolean apply(Game game, Ability source) {
-        Permanent targetMount = game.getPermanent(getTargetPointer().getFirst(game, source));
-        if (targetMount == null || !targetMount.hasSubtype(SubType.MOUNT, game)) {
-            return false;
-        }
-        return SaddleAbility.applySaddle(targetMount, game);
+        return SaddleAbility.applySaddle(game.getPermanent(getTargetPointer().getFirst(game, source)), game);
     }
 
 }