diff --git a/Mage.Sets/src/mage/cards/h/HaldanAvidArcanist.java b/Mage.Sets/src/mage/cards/h/HaldanAvidArcanist.java
index 9a9f4e6c022..ef1cb70e8ca 100644
--- a/Mage.Sets/src/mage/cards/h/HaldanAvidArcanist.java
+++ b/Mage.Sets/src/mage/cards/h/HaldanAvidArcanist.java
@@ -113,7 +113,7 @@ class HaldanAvidArcanistSpendAnyManaEffect extends AsThoughEffectImpl implements
 
     @Override
     public boolean applies(UUID objectId, Ability source, UUID affectedControllerId, Game game) {
-        return HaldanAvidArcanist.checkCard(objectId, source, affectedControllerId, game);
+        return true;
     }
 
     @Override
diff --git a/Mage.Sets/src/mage/cards/p/PakoArcaneRetriever.java b/Mage.Sets/src/mage/cards/p/PakoArcaneRetriever.java
index f7abe82234c..95a83edd0a4 100644
--- a/Mage.Sets/src/mage/cards/p/PakoArcaneRetriever.java
+++ b/Mage.Sets/src/mage/cards/p/PakoArcaneRetriever.java
@@ -64,8 +64,8 @@ class PakoArcaneRetrieverEffect extends OneShotEffect {
 
     PakoArcaneRetrieverEffect() {
         super(Outcome.Benefit);
-        staticText = "exile the top card of each player's library and put a fetch counter on each of them. " +
-                "Put a +1/+1 counter on {this} for each noncreature card exiled this way.";
+        staticText = "exile the top card of each player's library and put a fetch counter on each of them. "
+                + "Put a +1/+1 counter on {this} for each noncreature card exiled this way.";
     }
 
     private PakoArcaneRetrieverEffect(final PakoArcaneRetrieverEffect effect) {
@@ -129,7 +129,7 @@ class PakoArcaneRetrieverWatcher extends Watcher {
 
     boolean checkCard(UUID playerId, Card card, Game game) {
         return card != null && playerMap
-                .computeIfAbsent(playerId, u -> new HashSet<MageObjectReference>())
+                .computeIfAbsent(playerId, u -> new HashSet<>())
                 .stream()
                 .anyMatch(mageObjectReference -> mageObjectReference.refersTo(card.getId(), game));
     }