diff --git a/Main/src/main/java/com/chameleonvision/vision/camera/CameraManager.java b/Main/src/main/java/com/chameleonvision/vision/camera/CameraManager.java
index f85fca137..b66c69075 100644
--- a/Main/src/main/java/com/chameleonvision/vision/camera/CameraManager.java
+++ b/Main/src/main/java/com/chameleonvision/vision/camera/CameraManager.java
@@ -25,21 +25,20 @@ public class CameraManager {
 
     private static final Path CamConfigPath = Paths.get(SettingsManager.SettingsPath.toString(), "Cams");
 
-    // TODO: Fix suffix for camera
     // TODO: throw a camera Exception if no camera is connected
     static HashMap<String, UsbCameraInfo> AllUsbCameraInfosByName = new HashMap<>() {{
         var suffix = 0;
         for (var info : UsbCamera.enumerateUsbCameras()) {
-            var cap = new VideoCapture(info.name);
+            var cap = new VideoCapture(info.dev);
             if (cap.isOpened()) {
                 cap.release();
+                var name = info.name;
+                while (this.containsKey(name)) {
+                    suffix++;
+                    name = String.format("%s(%s)", info.name, suffix);
+                }
+                put(name, info);
             }
-            var name = info.name;
-            while (this.containsKey(name)) {
-                suffix++;
-                name = String.format("%s(%s)", info.name, suffix);
-            }
-            put(name, info);
         }
     }};
 
@@ -67,10 +66,6 @@ public class CameraManager {
                     System.err.println("Failed to add camera! Already exists!");
                 }
             }
-            // TODO: Set currentCameraName from GeneralSettings instead of this
-            if (currentCameraName == null && AllCamerasByName.size() == 1) { // set current camera to first found
-                currentCameraName = AllCamerasByName.keySet().stream().findFirst().get();
-            }
         }
     }
 
diff --git a/chameleon-client/src/App.vue b/chameleon-client/src/App.vue
index 7e076e612..83e199746 100644
--- a/chameleon-client/src/App.vue
+++ b/chameleon-client/src/App.vue
@@ -100,12 +100,9 @@
         let message = JSON.parse(data.data);
              for (var prop in message){
         if(message.hasOwnProperty(prop)){
-          if(!this.isEquale(message,prop)){
             this.$store.state[prop] = message[prop];
             console.log(message);
-          } else{
-            console.log("data is the same");
-          }
+        
         }
 
        }