diff --git a/app/src/main/java/org/ntlab/irisclient/DrawingCardFragment.java b/app/src/main/java/org/ntlab/irisclient/DrawingCardFragment.java
index 01256d0..d8ddd44 100644
--- a/app/src/main/java/org/ntlab/irisclient/DrawingCardFragment.java
+++ b/app/src/main/java/org/ntlab/irisclient/DrawingCardFragment.java
@@ -266,7 +266,7 @@
 
         Context context = getContext();
 
-        for (int i = 0; i < 16; i++) {
+        for (Integer i: map) {
 
             // タップとロングタップのセット
             imageButtons[i].setOnClickListener(this::onClick);