diff --git a/public/trivabble.js b/public/trivabble.js
index 3df5623..08b6dbf 100644
--- a/public/trivabble.js
+++ b/public/trivabble.js
@@ -612,33 +612,32 @@
         rackBCR  = rack.getBoundingClientRect();
         bagBCR   = bag.getBoundingClientRect();
 
-        let from;
+        let from = null;
         let index;
 
-        let p = movingTile.parentNode;
-        let oldP = movingTile;
-        let oldOldP = null;
+        let p = movingTile;
 
-        while (p) {
-            if (p === board) {
+        while (p && !from) {
+            index = boardCells.indexOf(p);
+            if (index !== -1) {
                 from  = "board";
-                index = boardCells.indexOf(oldOldP);
-
                 break;
             }
 
-            if (p === rack) {
+            index = playerLetters.indexOf(p);
+            if (index !== -1) {
                 from  = "rack";
-                index = playerLetters.indexOf(oldP);
-
                 break;
             }
 
-            oldOldP = oldP;
-            oldP = p;
             p = p.parentNode;
         }
 
+        if (!from) {
+            fatalError(new Error("Error: did not find the parent of the moving tile"));
+            return;
+        }
+
         moveCMD = {
             cmd: "moveLetter",
             from: from,