diff --git a/srcs/juloo.keyboard2/KeyboardData.java b/srcs/juloo.keyboard2/KeyboardData.java
index d4228e7..d174957 100644
--- a/srcs/juloo.keyboard2/KeyboardData.java
+++ b/srcs/juloo.keyboard2/KeyboardData.java
@@ -82,7 +82,7 @@ public final class KeyboardData
   boolean add_key_to_pos(List<Row> rows, KeyValue kv, KeyPos p)
   {
     int i_row = p.row;
-    int i_row_end = Math.min(p.row, rows.size());
+    int i_row_end = Math.min(p.row, rows.size() - 1);
     if (p.row == -1) { i_row = 0; i_row_end = rows.size() - 1; }
     for (; i_row <= i_row_end; i_row++)
     {