diff --git a/core/java/src/freenet/support/CPUInformation/CPUIDCPUInfo.java b/core/java/src/freenet/support/CPUInformation/CPUIDCPUInfo.java
index a6d2d845a..820b657e5 100644
--- a/core/java/src/freenet/support/CPUInformation/CPUIDCPUInfo.java
+++ b/core/java/src/freenet/support/CPUInformation/CPUIDCPUInfo.java
@@ -62,8 +62,7 @@ public class CPUIDCPUInfo implements CPUInfo
      * @since 0.9.21
      */
     public boolean hasAVX2() {
-        return this.hasABM() &&
-               (CPUID.getExtendedEBXFeatureFlags() & (1 << 5)) != 0; //Extended EBX Feature Bit 5
+        return (CPUID.getExtendedEBXFeatureFlags() & (1 << 5)) != 0; //Extended EBX Feature Bit 5
     }
     
     /**
diff --git a/core/java/src/freenet/support/CPUInformation/IntelInfoImpl.java b/core/java/src/freenet/support/CPUInformation/IntelInfoImpl.java
index a6fc03523..119a6be7c 100644
--- a/core/java/src/freenet/support/CPUInformation/IntelInfoImpl.java
+++ b/core/java/src/freenet/support/CPUInformation/IntelInfoImpl.java
@@ -377,7 +377,8 @@ class IntelInfoImpl extends CPUIDCPUInfo implements IntelCPUInfo
                     case 0x45:
                     case 0x46:
                     	CPUIDCPUInfo c = new CPUIDCPUInfo();
-                        if (c.hasAVX2() && c.hasBMI1() && c.hasBMI2()) {
+                        if (c.hasAVX2() && c.hasBMI1()  && c.hasBMI2() &&
+                        	c.hasFMA3() && c.hasMOVBE() && c.hasABM()) {
                             isSandyCompatible = true;
                             isIvyCompatible = true;
                             isHaswellCompatible = true;