diff --git a/cortex-cpp/CMakeLists.txt b/cortex-cpp/CMakeLists.txt
index ae9c31ad2..824ba67b7 100644
--- a/cortex-cpp/CMakeLists.txt
+++ b/cortex-cpp/CMakeLists.txt
@@ -2,7 +2,9 @@ cmake_minimum_required(VERSION 3.5)
 project(cortex-cpp C CXX)
 
 include(engines/cortex.llamacpp/engine.cmake)
-include(engines/cortex.python/engine.cmake)
+if(NOT LLAMA_CUDA)
+  include(engines/cortex.python/engine.cmake)
+endif()
 include(CheckIncludeFileCXX)
 
 check_include_file_cxx(any HAS_ANY)
diff --git a/cortex-cpp/Makefile b/cortex-cpp/Makefile
index 84461326e..20cd4da7f 100644
--- a/cortex-cpp/Makefile
+++ b/cortex-cpp/Makefile
@@ -106,10 +106,8 @@ endif
 ifeq ($(OS),Windows_NT)
 	@powershell -Command "cp -r build\engines\cortex.python cortex-cpp\engines\;"
 	@powershell -Command "cd cortex-cpp;..\..\.github\scripts\e2e-test-python-windows.bat cortex-cpp.exe ..\..\.github\scripts\$(PYTHON_FILE_EXECUTION_PATH);"
-	@powershell -Command "rm *.txt;"
-	@powershell -Command "ls .\engines;"
-	@powershell -Command "cd engines; rm -r cortex.python;"
-	@powershell -Command "ls;"
+	@powershell -Command "cd .\cortex-cpp\; rm *.txt;"
+	@powershell -Command "mkdir python-temp; cd .\cortex-cpp\engines; Move-Item -Path .\cortex.python -Destination ..\..\python-temp;"
 else ifeq ($(shell uname -s),Linux)
 	@cp -rf build/engines/cortex.python cortex-cpp/engines/; \
 	cd cortex-cpp; \