diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 25d47e62c..f0cca71e4 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -24,7 +24,7 @@ jobs:
 
       - name: CMake
         run: |
-          cmake -B build -G "Visual Studio 17 2022" -DCMAKE_BUILD_TYPE=${{ matrix.build_type }}
+          cmake -B build -G "Visual Studio 17 2022" -A x64 -DCMAKE_BUILD_TYPE=${{ matrix.build_type }}
           cmake --build build
 
       - name: Build testproject
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 40085698c..16fda2351 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -36,8 +36,7 @@ if (NOT C3_LLVM_VERSION STREQUAL "auto")
     endif()
 endif()
 
-if (true)
-#if(CMAKE_C_COMPILER_ID STREQUAL "MSVC")
+if(CMAKE_C_COMPILER_ID STREQUAL "MSVC")
     if (C3_LLVM_VERSION STREQUAL "auto")
         set(C3_LLVM_VERSION "13")
     endif()