diff --git a/Qwirkle/QwirkleClassLibrary/Game.cs b/Qwirkle/QwirkleClassLibrary/Game.cs
index 93785ff..c902777 100644
--- a/Qwirkle/QwirkleClassLibrary/Game.cs
+++ b/Qwirkle/QwirkleClassLibrary/Game.cs
@@ -427,8 +427,17 @@ namespace QwirkleClassLibrary
 
                 int dx = adjacentCell.GetX - cell.GetX;
                 int dy = adjacentCell.GetY - cell.GetY;
+                
+                if (adjacentCell.GetX == cell.GetX)
+                {
+                    score += CalculateLineScore(cell, dx, 1, b);
+
+                }
+                else
+                {
+                    score += CalculateLineScore(cell, 1, dy, b);
 
-                score += CalculateLineScore(cell, dx, dy, b);
+                }
             }
 
             return score;
@@ -438,13 +447,13 @@ namespace QwirkleClassLibrary
         {
             int score = 0;
 
-            for (int i = 1; i < b.Rows; i++)
+            for (int i = 1; i < 7; i++)
             {
                 var extendedCell = b.GetCell(cell.GetX + i * dx, cell.GetY + i * dy);
 
                 if (extendedCell?.GetTile == null)
                 {
-                    break;
+                    continue;
                 }
 
                 score++;