diff --git a/Vocaluxe/Lib/Input/WiiMote/WiiMoteLib.cs b/Vocaluxe/Lib/Input/WiiMote/WiiMoteLib.cs
index b4e234c9..d23258ab 100644
--- a/Vocaluxe/Lib/Input/WiiMote/WiiMoteLib.cs
+++ b/Vocaluxe/Lib/Input/WiiMote/WiiMoteLib.cs
@@ -238,11 +238,22 @@ namespace Vocaluxe.Lib.Input.WiiMote
             }
 
             //Try WiiMotion
-            Connected = _TryConnect(_PID);
+            if (Connected = CHIDApi.Open(_VID, _PID, out _Handle))
+            {
+                if (!(Connected = _ReadCalibration()))
+                    CHIDApi.Close(_Handle);
+            }
+
+            if (Connected)
+                return true;
 
             //Try WiiMotion Plus
-            if (!Connected)
-                Connected = _TryConnect(_PIDPlus);
+            if (Connected = CHIDApi.Open(_VID, _PIDPlus, out _Handle))
+            {
+                if (!(Connected = _ReadCalibration()))
+                    CHIDApi.Close(_Handle);
+            }
+
 
             return Connected;
         }