diff --git a/src/main/java/com/ntlab/irisserver/entities/Game.java b/src/main/java/com/ntlab/irisserver/entities/Game.java
index aaa6c38..f7903ef 100644
--- a/src/main/java/com/ntlab/irisserver/entities/Game.java
+++ b/src/main/java/com/ntlab/irisserver/entities/Game.java
@@ -79,9 +79,14 @@
             c.setDno(map.get(i));
 
             //今回のゲームで使用するキーワードを追加
+            //keywordList.put(i, randKeys.get(i));//(dno, キーワード)
+        }
+        int drawNum = 16;
+        if(16%memberList.size()!=0) drawNum = (num+1)*memberList.size();
+
+        for(int i=0; i<drawNum; i++){
             keywordList.put(i, randKeys.get(i));//(dno, キーワード)
         }
-
         //１ターン目の作成
         nowTurn = new Turn();
         nowTurn.setTeam("r");
@@ -112,10 +117,20 @@
         return keyword;
     }
 
+//    public List<String> getKeywords() {
+//        List<String> keywords = new ArrayList<>();
+//        for(int i=0; i<16; i++){
+//            keywords.add(keywordList.get(map.get(i)));
+//        }
+//        return keywords;
+//    }
+
     public List<String> getKeywords() {
         List<String> keywords = new ArrayList<>();
-        for(int i=0; i<16; i++){
-            keywords.add(keywordList.get(map.get(i)));
+        for(List<Integer> dnoList: assignments.values()){
+            for(int i=0; i<dnoList.size(); i++){
+                keywords.add(keywordList.get(dnoList.get(i)));
+            }
         }
         return keywords;
     }