diff --git a/conanfile.py b/conanfile.py
index e91acc6..135a4f9 100644
--- a/conanfile.py
+++ b/conanfile.py
@@ -25,6 +25,7 @@ class PkmnLibConan(ConanFile):
 
     def package(self):
         self.copy("*.hpp", dst="include/PkmnLib", src="src")
+        self.copy("*.h", dst="include/extern", src="extern")
         self.copy("*.dll", dst="bin", keep_path=False)
         self.copy("*.so", dst="lib", keep_path=False)
 
diff --git a/src/ScriptResolving/AngelScript/ContextPool.hpp b/src/ScriptResolving/AngelScript/ContextPool.hpp
index 6acbbf2..993c6d0 100644
--- a/src/ScriptResolving/AngelScript/ContextPool.hpp
+++ b/src/ScriptResolving/AngelScript/ContextPool.hpp
@@ -29,8 +29,8 @@ public:
     }
 
     void ReturnContextToPool(asIScriptContext* ctx) {
-        _pool.push_back(ctx);
         ctx->Unprepare();
+        _pool.push_back(ctx);
     }
 };