diff --git a/Hardware/Heatmaster/Heatmaster.cs b/Hardware/Heatmaster/Heatmaster.cs
index d453265..eef4c65 100644
--- a/Hardware/Heatmaster/Heatmaster.cs
+++ b/Hardware/Heatmaster/Heatmaster.cs
@@ -143,10 +143,10 @@ namespace OpenHardwareMonitor.Hardware.Heatmaster {
         firmwareRevision = ReadInteger(0, 'V');
         firmwareCRC = ReadInteger(0, 'C');
 
-        int fanCount = ReadInteger(32, '?');
-        int temperatureCount = ReadInteger(48, '?');
-        int flowCount = ReadInteger(64, '?');
-        int relayCount =  ReadInteger(80, '?');
+        int fanCount = Math.Min(ReadInteger(32, '?'), 4);
+        int temperatureCount = Math.Min(ReadInteger(48, '?'), 6);
+        int flowCount = Math.Min(ReadInteger(64, '?'), 1);
+        int relayCount =  Math.Min(ReadInteger(80, '?'), 1);
 
         fans = new Sensor[fanCount];
         controls = new Sensor[fanCount];
diff --git a/Hardware/Heatmaster/HeatmasterGroup.cs b/Hardware/Heatmaster/HeatmasterGroup.cs
index c31ab92..9becca3 100644
--- a/Hardware/Heatmaster/HeatmasterGroup.cs
+++ b/Hardware/Heatmaster/HeatmasterGroup.cs
@@ -71,7 +71,10 @@ namespace OpenHardwareMonitor.Hardware.Heatmaster {
       List<string> result = new List<string>();
       try {
         RegistryKey key = Registry.LocalMachine.OpenSubKey(
-          @"SYSTEM\CurrentControlSet\Enum\USB\Vid_10c4&Pid_ea60&Mi_00");
+          @"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 =
diff --git a/Properties/AssemblyVersion.cs b/Properties/AssemblyVersion.cs
index 9622b86..98ca704 100644
--- a/Properties/AssemblyVersion.cs
+++ b/Properties/AssemblyVersion.cs
@@ -38,5 +38,5 @@
 using System;
 using System.Reflection;
 
-[assembly: AssemblyVersion("0.1.37.7")]
-[assembly: AssemblyFileVersion("0.1.37.7")]
+[assembly: AssemblyVersion("0.1.37.8")]
+[assembly: AssemblyFileVersion("0.1.37.8")]