diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml
index 4caeba6..3f267b6 100644
--- a/.github/workflows/rust.yml
+++ b/.github/workflows/rust.yml
@@ -100,7 +100,9 @@ jobs:
 
       - name: Install MPIR on Windows
         if: matrix.os.name == 'Windows'
-        run: vcpkg install mpir:x64-windows-static
+        run: |
+          vcpkg install mpir:x64-windows-static
+          git clone https://github.com/Chia-Network/mpir_gc_x64.git
 
       - name: Set up Rust
         uses: dtolnay/rust-toolchain@stable
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 651e17c..22cb662 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -31,11 +31,11 @@ if(WIN32)
     ${MPIR_INCLUDE_DIR}
   )
   find_library(MPIR_LIBRARY NAMES mpir PATHS ${MPIR_LIBRARY_DIR} NO_DEFAULT_PATH)
-  if(MPIR_LIBRARY)
+  if(SKIP_MPIR_LINK)
+    message(STATUS "MPIR library found, skipping linking")
+  elseif(MPIR_LIBRARY)
     message(STATUS "MPIR library found at ${MPIR_LIBRARY}")
     link_libraries(${MPIR_LIBRARY})
-  elseif(SKIP_MPIR_LINK)
-    message(STATUS "MPIR library not found, skipping linking")
   else()
     message(FATAL_ERROR "MPIR library not found")
   endif()