diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 6036888..478cc0a 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -88,7 +88,7 @@ jobs:
       - run: |
           call "C:\Program Files\Microsoft Visual Studio\2022\Enterprise\VC\Auxiliary\Build\vcvars64.bat" && ^
           cd %TEMP% && ^
-          nmake /NOLOGO /F Makefile.win OPTFLAGS="/arch:AVX2" && ^
+          nmake /NOLOGO /F Makefile.win && ^
           nmake /NOLOGO /F Makefile.win install && ^
           nmake /NOLOGO /F Makefile.win installcheck && ^
           nmake /NOLOGO /F Makefile.win clean && ^
diff --git a/src/halfvec.h b/src/halfvec.h
index 9b689dc..2e7d29c 100644
--- a/src/halfvec.h
+++ b/src/halfvec.h
@@ -8,15 +8,10 @@
 #include "vector.h"
 
 /* F16C has better performance than _Float16 (on x86-64) */
-#if defined(__F16C__)
-#define F16C_SUPPORT
-/* TODO Improve detection */
-#elif defined(_MSC_VER) && defined(__AVX2__)
+#if defined(__F16C__) || defined(_MSC_VER)
 #define F16C_SUPPORT
 #elif defined(__FLT16_MAX__)
 #define FLT16_SUPPORT
-#else
-#error "Not supported"
 #endif
 
 #ifdef FLT16_SUPPORT