diff --git a/Mage.Sets/src/mage/cards/n/NighthawkScavenger.java b/Mage.Sets/src/mage/cards/n/NighthawkScavenger.java
index 51a02a34d22..3a9cf514f22 100644
--- a/Mage.Sets/src/mage/cards/n/NighthawkScavenger.java
+++ b/Mage.Sets/src/mage/cards/n/NighthawkScavenger.java
@@ -111,7 +111,9 @@ enum NighthawkScavengerHint implements Hint {
                 .flatMap(Collection::stream)
                 .map(MageObject::getCardType)
                 .flatMap(Collection::stream)
+                .distinct()
                 .map(CardType::toString)
+                .sorted()
                 .reduce((s1, s2) -> s1 + ", " + s2)
                 .orElse("None");
         return "Card types in opponents' graveyards: " + types;
diff --git a/Mage.Sets/src/mage/cards/t/Tarmogoyf.java b/Mage.Sets/src/mage/cards/t/Tarmogoyf.java
index 47775bbb1a5..335b00fbe2e 100644
--- a/Mage.Sets/src/mage/cards/t/Tarmogoyf.java
+++ b/Mage.Sets/src/mage/cards/t/Tarmogoyf.java
@@ -99,7 +99,9 @@ enum TarmogoyfHint implements Hint {
                 .flatMap(Collection::stream)
                 .map(MageObject::getCardType)
                 .flatMap(Collection::stream)
+                .distinct()
                 .map(CardType::toString)
+                .sorted()
                 .reduce((s1, s2) -> s1 + ", " + s2)
                 .orElse("None");
         return "Card types in graveyards: " + types;