diff --git a/Mage.Sets/src/mage/cards/c/CogworkAssembler.java b/Mage.Sets/src/mage/cards/c/CogworkAssembler.java
index d5d7ecfdd1..a5b9c66a99 100644
--- a/Mage.Sets/src/mage/cards/c/CogworkAssembler.java
+++ b/Mage.Sets/src/mage/cards/c/CogworkAssembler.java
@@ -42,10 +42,9 @@ import mage.cards.CardSetInfo;
 import mage.constants.CardType;
 import mage.constants.Outcome;
 import mage.constants.Zone;
-import mage.filter.StaticFilters;
 import mage.game.Game;
 import mage.game.permanent.Permanent;
-import mage.target.common.TargetControlledPermanent;
+import mage.target.common.TargetArtifactPermanent;
 import mage.target.targetpointer.FixedTarget;
 
 /**
@@ -56,15 +55,14 @@ public class CogworkAssembler extends CardImpl {
 
     public CogworkAssembler(UUID ownerId, CardSetInfo setInfo) {
         super(ownerId, setInfo, new CardType[]{CardType.ARTIFACT, CardType.CREATURE}, "{3}");
-        
-        this.subtype.add("Assembly");
-        this.subtype.add("Worker");
+
+        this.subtype.add("Assembly-Worker");
         this.power = new MageInt(2);
         this.toughness = new MageInt(3);
 
         // {7}: Create a token that's a copy of target artifact. That token gains haste. Exile it at the beginning of the next end step.
         Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new CogworkAssemblerCreateTokenEffect(), new GenericManaCost(7));
-        ability.addTarget(new TargetControlledPermanent(StaticFilters.FILTER_CONTROLLED_PERMANENT_ARTIFACT));
+        ability.addTarget(new TargetArtifactPermanent());
         this.addAbility(ability);
     }