diff --git a/lib/TicTacToe.js b/lib/TicTacToe.js
index f53bb5e..38e1d8f 100644
--- a/lib/TicTacToe.js
+++ b/lib/TicTacToe.js
@@ -182,10 +182,12 @@ class TicTacToe {
       return NA;
     }
 
+    let scanSize = this.grid - (this.grid - this.pieceWinCount);
+
     // check row -
     for (let i = 0; i < this.grid; ++i) {
       let samePiece = 1;
-      for (let j = 0; j < this.grid - 1; ++j) {
+      for (let j = 0; j < scanSize - 1; ++j) {
         const CURRENT_INDEX = i * this.grid + j;
         if (this.board[CURRENT_INDEX] === this.board[CURRENT_INDEX + 1] && this.board[CURRENT_INDEX] !== NA) {
           samePiece++;
@@ -202,7 +204,7 @@ class TicTacToe {
     // check columns |
     for (let j = 0; j < this.grid; ++j) {
       let samePiece = 1;
-      for (let i = 0; i < this.grid - 1; ++i) {
+      for (let i = 0; i < scanSize - 1; ++i) {
         const CURRENT_INDEX = i * this.grid + j;
         if (this.board[CURRENT_INDEX] === this.board[(i + 1) * this.grid + j] && this.board[CURRENT_INDEX] !== NA) {
           samePiece++;