diff --git a/game/board.cpp b/game/board.cpp
index c3a6699..bb65f6e 100644
--- a/game/board.cpp
+++ b/game/board.cpp
@@ -351,7 +351,7 @@ int Board::checkRoundAux(const Matrix<Tile> &iTilesMx,
 
     // We may not be allowed to use so many letters from the rack
     // (cf. "7 among 8" variant)
-    if (fromrack > m_params.getLettersToPlay())
+    if (checkJunction && fromrack > m_params.getLettersToPlay())
         return 9;
 
     // The word must cover at least one anchor square, except
diff --git a/game/game.cpp b/game/game.cpp
index 4c4df2b..386583a 100644
--- a/game/game.cpp
+++ b/game/game.cpp
@@ -576,7 +576,7 @@ int Game::checkPlayedWord(const wstring &iCoord,
             return 10;
     }
 
-    if (checkRack)
+    if (checkWordAndJunction && checkRack)
     {
         // Check that the word can be formed with the tiles in the rack:
         // we first create a copy of the rack, then we remove the tiles