diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index b2d53bd..544bd35 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -411,13 +411,13 @@ jobs:
       working-directory: ".\\openssl"
       shell: cmd
       run: |
-        call "C:\Program Files\Microsoft Visual Studio\2022\Enterprise\VC\Auxiliary\Build\vcvars64.bat"
+        call "C:\Program Files\Microsoft Visual Studio\18\Enterprise\VC\Auxiliary\Build\vcvars64.bat"
         perl Configure no-makedepend ${{ matrix.release.configopts }}
     - name: "Build openssl"
       working-directory: ".\\openssl"
       shell: cmd
       run: |
-        call "C:\Program Files\Microsoft Visual Studio\2022\Enterprise\VC\Auxiliary\Build\vcvars64.bat"
+        call "C:\Program Files\Microsoft Visual Studio\18\Enterprise\VC\Auxiliary\Build\vcvars64.bat"
         nmake
     - name: "Checkout perftools"
       uses: "actions/checkout@v5"
diff --git a/source/handshake.c b/source/handshake.c
index 06c1f7f..f87c6ca 100644
--- a/source/handshake.c
+++ b/source/handshake.c
@@ -246,9 +246,9 @@ static void free_ctx_pool()
         return;
     for (int i = 0; i < pool_size; ++i) {
         if (ctx_pool[i]) {
-            OSSL_LIB_CTX_free(ctx_pool[i]->libctx);
             SSL_CTX_free(ctx_pool[i]->sctx);
             SSL_CTX_free(ctx_pool[i]->cctx);
+            OSSL_LIB_CTX_free(ctx_pool[i]->libctx);
             OPENSSL_free(ctx_pool[i]);
         }
     }