diff --git a/Mage.Sets/src/mage/cards/m/MaddeningHex.java b/Mage.Sets/src/mage/cards/m/MaddeningHex.java
index 9d19bcca303..90ec227dd91 100644
--- a/Mage.Sets/src/mage/cards/m/MaddeningHex.java
+++ b/Mage.Sets/src/mage/cards/m/MaddeningHex.java
@@ -132,7 +132,7 @@ class MaddeningHexEffect extends OneShotEffect {
             opponents.remove(player.getId());
         }
         if (!opponents.isEmpty()) {
-            permanent.attachTo(RandomUtil.randomFromSet(opponents), source, game);
+            permanent.attachTo(RandomUtil.randomFromCollection(opponents), source, game);
         }
         return true;
     }
diff --git a/Mage/src/main/java/mage/players/PlayerImpl.java b/Mage/src/main/java/mage/players/PlayerImpl.java
index 4dc9bbc5630..6e1e60d2b3a 100644
--- a/Mage/src/main/java/mage/players/PlayerImpl.java
+++ b/Mage/src/main/java/mage/players/PlayerImpl.java
@@ -2716,7 +2716,7 @@ public abstract class PlayerImpl implements Player, Serializable {
                 .stream()
                 .filter(card -> filter.match(card, source.getSourceId(), getId(), game))
                 .collect(Collectors.toSet());
-        Card card = RandomUtil.randomFromSet(cards);
+        Card card = RandomUtil.randomFromCollection(cards);
         if (card == null) {
             return false;
         }
diff --git a/Mage/src/main/java/mage/util/RandomUtil.java b/Mage/src/main/java/mage/util/RandomUtil.java
index eebff33234c..5f2458c4dcc 100644
--- a/Mage/src/main/java/mage/util/RandomUtil.java
+++ b/Mage/src/main/java/mage/util/RandomUtil.java
@@ -1,16 +1,15 @@
 package mage.util;
 
 import java.awt.*;
-import java.io.Serializable;
+import java.util.Collection;
 import java.util.Random;
-import java.util.Set;
 
 /**
  * Created by IGOUDT on 5-9-2016.
  */
 public final class RandomUtil {
 
-    private static Random random = new Random(); // thread safe with seed support
+    private static final Random random = new Random(); // thread safe with seed support
 
     private RandomUtil() {
     }
@@ -43,15 +42,15 @@ public final class RandomUtil {
         random.setSeed(newSeed);
     }
 
-    public static <T extends Serializable> T randomFromSet(Set<T> collection) {
+    public static <T> T randomFromCollection(Collection<T> collection) {
         if (collection.size() < 2) {
             return collection.stream().findFirst().orElse(null);
         }
         int rand = nextInt(collection.size());
         int count = 0;
-        for (T currentId : collection) {
+        for (T current : collection) {
             if (count == rand) {
-                return currentId;
+                return current;
             }
             count++;
         }