diff --git a/forge-game/src/main/java/forge/game/keyword/KeywordCollection.java b/forge-game/src/main/java/forge/game/keyword/KeywordCollection.java
index 4a5e7e37e6a..63202efbdca 100644
--- a/forge-game/src/main/java/forge/game/keyword/KeywordCollection.java
+++ b/forge-game/src/main/java/forge/game/keyword/KeywordCollection.java
@@ -15,7 +15,7 @@ public class KeywordCollection implements Iterable<KeywordInterface> {
     private transient KeywordCollectionView view;
     // don't use enumKeys it causes a slow down
     private final Multimap<Keyword, KeywordInterface> map = MultimapBuilder.hashKeys()
-            .arrayListValues().build();
+            .linkedHashSetValues().build();
 
     public KeywordCollection() {
         super();