diff --git a/.vs/AAWeb/v15/.suo b/.vs/AAWeb/v15/.suo
index a5c09c7fd..bcb873b47 100644
Binary files a/.vs/AAWeb/v15/.suo and b/.vs/AAWeb/v15/.suo differ
diff --git a/Canvas.js b/Canvas.js
index bcd5e32cb..b237269af 100644
--- a/Canvas.js
+++ b/Canvas.js
@@ -393,7 +393,7 @@ function newCanvas() {
 
             if (floatingObjectDragStarted) {
 
-                let floatingObject = thisObject.floatingSpace.floatingLayer.floatingObjects[floatingObjectBeingDragged];
+                let floatingObject = thisObject.floatingSpace.floatingLayer.getFloatingObject(undefined, floatingObjectBeingDragged);
 
                 floatingObject.currentPosition.x = dragVector.upX;
                 floatingObject.currentPosition.y = dragVector.upY;
diff --git a/FloatingSpace/FloatingLayer.js b/FloatingSpace/FloatingLayer.js
index 561968de3..23d46ed66 100644
--- a/FloatingSpace/FloatingLayer.js
+++ b/FloatingSpace/FloatingLayer.js
@@ -148,27 +148,43 @@ function newFloatingLayer() {
         }
     }
 
-    function getFloatingObject(pFloatingObjectHandle) {
+    function getFloatingObject(pFloatingObjectHandle, pFloatingObjectIndex) {
 
         if (INFO_LOG === true) { logger.write("[INFO] getFloatingObject -> Entering function."); }
 
-        for (let i = 0; i < invisibleFloatingObjects.length; i++) {
+        if (pFloatingObjectHandle !== undefined) {
 
-            let floatingObject = invisibleFloatingObjects[i];
+            for (let i = 0; i < invisibleFloatingObjects.length; i++) {
 
-            if (floatingObject.handle === pFloatingObjectHandle) {
+                let floatingObject = invisibleFloatingObjects[i];
 
-                return floatingObject;
+                if (floatingObject.handle === pFloatingObjectHandle) {
+
+                    return floatingObject;
+                }
+            }
+
+            for (let i = 0; i < thisObject.floatingObjects.length; i++) {
+
+                let floatingObject = thisObject.floatingObjects[i];
+
+                if (floatingObject.handle === pFloatingObjectHandle) {
+
+                    return floatingObject;
+                }
             }
         }
 
-        for (let i = 0; i < thisObject.floatingObjects.length; i++) {
+        if (pFloatingObjectIndex !== undefined) {
 
-            let floatingObject = thisObject.floatingObjects[i];
+            for (let i = 0; i < thisObject.floatingObjects.length; i++) {
 
-            if (floatingObject.handle === pFloatingObjectHandle) {
+                let floatingObject = thisObject.floatingObjects[i];
 
-                return floatingObject;
+                if (i === pFloatingObjectIndex) {
+
+                    return floatingObject;
+                }
             }
         }
     }
diff --git a/server.js b/server.js
index f4b180fca..626140bfd 100644
--- a/server.js
+++ b/server.js
@@ -6,7 +6,7 @@ if (CONSOLE_LOG === true) {
 
 }
 
-const DEBUG_MODE = false;           // This forces the server to read Plotters from the local drive.
+const DEBUG_MODE = true;           // This forces the server to read Plotters from the local drive.
 
 if (CONSOLE_LOG === true && DEBUG_MODE === true) {