diff --git a/Grille.php b/Grille.php
index 4624737..16aee23 100644
--- a/Grille.php
+++ b/Grille.php
@@ -99,6 +99,7 @@ class Grille implements ArrayAccess
                 "verticales" => []
             ];
             foreach($this->lignes as $y => $mots) {
+                $mots = explode_pos(CASE_NOIRE, $this->get_ligne($y, $this->largeur));
                 $this->definitions["horizontales"][$y] = [];
                 foreach($mots as $fin => $mot) {
                     $definitions = $this->dico[strlen($mot)][$mot];
@@ -112,6 +113,7 @@ class Grille implements ArrayAccess
                 }
             }
             foreach($this->colonnes as $x => $mots) {
+                $mots = explode_pos(CASE_NOIRE, $this->get_colonne($x, $this->hauteur));
                 $this->definitions["verticales"][$x] = [];
                 foreach($mots as $fin => $mot) {
                     $definitions = $this->dico[strlen($mot)][$mot];
@@ -182,8 +184,8 @@ class Grille implements ArrayAccess
 
             // Omission des doublons
             $mots = [];
-            if ($x == $this->largeur - 1) $mots = explode_pos(CASE_NOIRE, $this->get_ligne($y, $this->largeur));
-            else if ($lettre == CASE_NOIRE) $mots = explode_pos(CASE_NOIRE, $this->get_ligne($y, $x));
+            if ($x == $this->largeur - 1) $mots = explode(CASE_NOIRE, $this->get_ligne($y, $this->largeur));
+            else if ($lettre == CASE_NOIRE) $mots = explode(CASE_NOIRE, $this->get_ligne($y, $x));
             else $mots = [];
             $this->lignes[$y] = array_filter($mots, function ($mot) {
                 return strlen($mot) >= 2;
@@ -195,9 +197,9 @@ class Grille implements ArrayAccess
             }
 
             if ($y == $this->hauteur - 1) {
-                $mots = explode_pos(CASE_NOIRE, $this->get_colonne($x, $this->hauteur));
+                $mots = explode(CASE_NOIRE, $this->get_colonne($x, $this->hauteur));
                 foreach ($mots as $rang => $mot) {
-                    //if (strlen($mot) < 2) continue;
+                    if (strlen($mot) < 2) continue;
                     if (strlen($mot > 2) && in_array($mot, array_merge(...$this->lignes, ...$this->colonnes))) continue 2;
                     else $this->colonnes[$x][$rang] = $mot;
                 }
diff --git a/index.php b/index.php
index f73d94b..65df085 100644
--- a/index.php
+++ b/index.php
@@ -145,14 +145,14 @@ function mot_courant($mots, $position) {
                                     <?php else: ?>
                                         <td class="case blanche">
                                             <?php
-                                                $title = "";
+                                                $title = [];
                                                 $definition_horizontale = mot_courant($grille->definitions["horizontales"][$y], $x);
                                                 $definition_verticale = mot_courant($grille->definitions["verticales"][$x], $y);
-                                                if (isset($definition_horizontale[0])) $title .= "→ " . $definition_horizontale[0];
-                                                if (isset($definition_horizontale[1])) $title .= " (" . $definition_horizontale[1] . ")";
-                                                if (isset($definition_verticale[0])) $title .= "\n↓  " . $definition_verticale[0];
-                                                if (isset($definition_verticale[1])) $title .= " (" . $definition_verticale[1] . ")";
-                                                $title = htmlspecialchars($title);
+                                                if (isset($definition_horizontale[0])) $title[0] = "→ " . $definition_horizontale[0];
+                                                if (isset($definition_horizontale[1])) $title[0] .= " (" . $definition_horizontale[1] . ")";
+                                                if (isset($definition_verticale[0])) $title[1] = "↓  " . $definition_verticale[0];
+                                                if (isset($definition_verticale[1])) $title[1] .= " (" . $definition_verticale[1] . ")";
+                                                $title = htmlspecialchars(implode("\n", $title));
                                             ?>
                                             <input id="<?= chr($x + 65) . ($y + 1) ?>" type="text" maxlength="1" size="1" pattern="[A-Z]"
                                                 title="<?=$title?>" />