diff --git a/Hardware/Heatmaster/HeatmasterGroup.cs b/Hardware/Heatmaster/HeatmasterGroup.cs
index 9becca3..0a745dc 100644
--- a/Hardware/Heatmaster/HeatmasterGroup.cs
+++ b/Hardware/Heatmaster/HeatmasterGroup.cs
@@ -69,20 +69,20 @@ namespace OpenHardwareMonitor.Hardware.Heatmaster {
 
     private static string[] GetRegistryPortNames() {
       List<string> result = new List<string>();
+      string[] paths = { "", "&MI_00" };
       try {
-        RegistryKey key = Registry.LocalMachine.OpenSubKey(
-          @"SYSTEM\CurrentControlSet\Enum\USB\VID_10C4&PID_EA60");
-        if (key == null)
-          key = Registry.LocalMachine.OpenSubKey(
-            @"SYSTEM\CurrentControlSet\Enum\USB\VID_10C4&PID_EA60&MI_00");           
-        if (key != null) {
-          foreach (string subKeyName in key.GetSubKeyNames()) {
-            RegistryKey subKey =
-              key.OpenSubKey(subKeyName + "\\" + "Device Parameters");
-            if (subKey != null) {
-              string name = subKey.GetValue("PortName") as string;
-              if (name != null)
-                result.Add((string)name);
+        foreach (string path in paths) {
+          RegistryKey key = Registry.LocalMachine.OpenSubKey(
+            @"SYSTEM\CurrentControlSet\Enum\USB\VID_10C4&PID_EA60" + path);
+          if (key != null) {
+            foreach (string subKeyName in key.GetSubKeyNames()) {
+              RegistryKey subKey =
+                key.OpenSubKey(subKeyName + "\\" + "Device Parameters");
+              if (subKey != null) {
+                string name = subKey.GetValue("PortName") as string;
+                if (name != null && !result.Contains(name))
+                  result.Add((string)name);
+              }
             }
           }
         }
diff --git a/Properties/AssemblyVersion.cs b/Properties/AssemblyVersion.cs
index 98ca704..0b2d2d7 100644
--- a/Properties/AssemblyVersion.cs
+++ b/Properties/AssemblyVersion.cs
@@ -38,5 +38,5 @@
 using System;
 using System.Reflection;
 
-[assembly: AssemblyVersion("0.1.37.8")]
-[assembly: AssemblyFileVersion("0.1.37.8")]
+[assembly: AssemblyVersion("0.1.37.9")]
+[assembly: AssemblyFileVersion("0.1.37.9")]