diff --git a/src/uci.cpp b/src/uci.cpp
index b17cf089..64489f79 100644
--- a/src/uci.cpp
+++ b/src/uci.cpp
@@ -189,7 +189,7 @@ namespace {
 
     string token;
     SearchLimits limits;
-    Move searchMoves[MAX_MOVES], *cur = searchMoves;
+    std::vector<Move> searchMoves;
     int time[] = { 0, 0 }, inc[] = { 0, 0 };
 
     while (up >> token)
@@ -216,14 +216,14 @@ namespace {
             up >> limits.maxTime;
         else if (token == "searchmoves")
             while (up >> token)
-                *cur++ = move_from_uci(pos, token);
+                searchMoves.push_back(move_from_uci(pos, token));
     }
 
-    *cur = MOVE_NONE;
+    searchMoves.push_back(MOVE_NONE);
     limits.time = time[pos.side_to_move()];
     limits.increment = inc[pos.side_to_move()];
 
-    return think(pos, limits, searchMoves);
+    return think(pos, limits, &searchMoves[0]);
   }