diff --git a/client/src/main/java/agolf/game/GameCanvas.java b/client/src/main/java/agolf/game/GameCanvas.java
index 031c671a..350e092c 100644
--- a/client/src/main/java/agolf/game/GameCanvas.java
+++ b/client/src/main/java/agolf/game/GameCanvas.java
@@ -593,7 +593,7 @@ public synchronized void mousePressed(MouseEvent event) {
                     this.removeMouseListener(this);
                     this.removeKeyListener(this);
                     this.setCursor(cursorDefault);
-                    if (super.gameContainer.gamePanel.tryStroke(true)) {
+                    if (super.gameContainer.gamePanel.tryStroke(false)) {
                         super.gameContainer.gamePanel.setBeginStroke(this.currentPlayerID, x, y, this.shootingMode);
                         //this.doHackedStroke(this.currentPlayerID, true, x, y, this.keyCountMod4);
                         this.doStroke(this.currentPlayerID, true, x, y, this.shootingMode);
diff --git a/client/src/main/java/agolf/game/GamePanel.java b/client/src/main/java/agolf/game/GamePanel.java
index fc56496b..987d386b 100644
--- a/client/src/main/java/agolf/game/GamePanel.java
+++ b/client/src/main/java/agolf/game/GamePanel.java
@@ -501,7 +501,7 @@ public void broadcastMessage(String message) {
         this.gameChatPanel.addBroadcastMessage(message);
     }
 
-    protected boolean tryStroke(boolean didNotTimeout) {
+    protected boolean tryStroke(boolean didTimeout) {
         synchronized (canStrokeLock) {
             if (this.isWaitingForTurnStart) {
                 return false;
@@ -510,10 +510,10 @@ protected boolean tryStroke(boolean didNotTimeout) {
             this.isWaitingForTurnStart = true;
         }
 
-        if (didNotTimeout) {
-            this.gamePlayerInfoPanel.stopTimer();
-        } else {
+        if (didTimeout) {
             this.gameCanvas.doZeroLengthStroke();
+        } else {
+            this.gamePlayerInfoPanel.stopTimer();
         }
 
         return true;
diff --git a/client/src/main/java/agolf/game/GamePlayerInfoPanel.java b/client/src/main/java/agolf/game/GamePlayerInfoPanel.java
index 3e688e63..941e515f 100644
--- a/client/src/main/java/agolf/game/GamePlayerInfoPanel.java
+++ b/client/src/main/java/agolf/game/GamePlayerInfoPanel.java
@@ -578,7 +578,7 @@ protected boolean run() {
         --this.currentTimeForShot;
         this.repaint();
         if (this.currentTimeForShot <= 0) {
-            this.gameContainer.gamePanel.tryStroke(false);
+            this.gameContainer.gamePanel.tryStroke(true);
             this.stopTimer();
             return false;
         } else {