diff --git a/core/java/src/freenet/support/CPUInformation/CPUIDCPUInfo.java b/core/java/src/freenet/support/CPUInformation/CPUIDCPUInfo.java
index c97f2d092..7962491c3 100644
--- a/core/java/src/freenet/support/CPUInformation/CPUIDCPUInfo.java
+++ b/core/java/src/freenet/support/CPUInformation/CPUIDCPUInfo.java
@@ -99,12 +99,13 @@ class CPUIDCPUInfo implements CPUInfo
     }
     
     /**
+     * Trailing Bit Manipulation (AMD feature)
      * @return true iff the CPU supports TBM.
-     * @since 0.9.26
+     * @since 0.9.26, broken before 0.9.35, fixed in 0.9.35
      */
     public boolean hasTBM()
     {
-        return (CPUID.getECXCPUFlags() & (1 << 21)) != 0; //ECX Bit 21
+        return (CPUID.getExtendedECXCPUFlags() & (1 << 21)) != 0; //Extended ECX Bit 21
     }
     
     /**
diff --git a/core/java/src/freenet/support/CPUInformation/CPUInfo.java b/core/java/src/freenet/support/CPUInformation/CPUInfo.java
index 6e00bb3a2..201f19c96 100644
--- a/core/java/src/freenet/support/CPUInformation/CPUInfo.java
+++ b/core/java/src/freenet/support/CPUInformation/CPUInfo.java
@@ -109,8 +109,9 @@ public interface CPUInfo
     public boolean hasADX();
     
     /**
+     * Trailing Bit Manipulation (AMD feature)
      * @return true iff the CPU supports TBM.
-     * @since 0.9.26
+     * @since 0.9.26, broken before 0.9.35, fixed in 0.9.35
      */
     public boolean hasTBM();