diff --git a/cpuid_x86.c b/cpuid_x86.c
index 0daf2b3cc8..b68a5202c2 100644
--- a/cpuid_x86.c
+++ b/cpuid_x86.c
@@ -1843,9 +1843,11 @@ int get_cpuname(void)
         if (support_avx2()) return CPUTYPE_ZEN;
         else return CPUTYPE_DUNNINGTON;
       default:
+        if (support_avx2()) return CPUTYPE_ZEN;
         return CPUTYPE_NEHALEM;
       }
     default:
+      if (support_avx2()) return CPUTYPE_ZEN;
       return CPUTYPE_NEHALEM;
     }
   }
diff --git a/driver/others/dynamic.c b/driver/others/dynamic.c
index 1f7142009f..338eb6f2b1 100644
--- a/driver/others/dynamic.c
+++ b/driver/others/dynamic.c
@@ -951,9 +951,15 @@ static gotoblas_t *get_coretype(void){
           else
             return &gotoblas_DUNNINGTON;
         default:
+          if (support_avx2())
+            return &gotoblas_ZEN;
+          else
           return &gotoblas_NEHALEM;
         }
       default:
+          if (support_avx2())
+            return &gotoblas_ZEN;
+          else
         return &gotoblas_NEHALEM;
     }
   }