diff --git a/core/build.h b/core/build.h
index d0372d330..14d405d7f 100755
--- a/core/build.h
+++ b/core/build.h
@@ -58,7 +58,11 @@
 
 #ifdef TARGET_WIN86
 	#define HOST_OS OS_WINDOWS
+#if defined(_M_AMD64)
+	#define HOST_CPU CPU_X64
+#else
 	#define HOST_CPU CPU_X86
+#endif
 #elif TARGET_PANDORA
 	#define HOST_OS OS_LINUX
 	#define HOST_CPU CPU_ARM
diff --git a/core/windows/winmain.cpp b/core/windows/winmain.cpp
index 310c01c1f..5fde0918c 100644
--- a/core/windows/winmain.cpp
+++ b/core/windows/winmain.cpp
@@ -126,14 +126,16 @@ int ExeptionHandler(u32 dwCode, void* pExceptionPointers)
 		return EXCEPTION_CONTINUE_EXECUTION;
 	}
 #if !defined(HOST_NO_REC) && HOST_CPU == CPU_X64
-	else if ( ngen_Rewrite((unat&)ep->ContextRecord->Eip,*(unat*)ep->ContextRecord->Esp,ep->ContextRecord->Eax) )
-	{
-		//remove the call from call stack
-		ep->ContextRecord->Esp+=4;
-		//restore the addr from eax to ecx so its valid again
-		ep->ContextRecord->Ecx=ep->ContextRecord->Eax;
-		return EXCEPTION_CONTINUE_EXECUTION;
-	}
+	/*
+		else if ( ngen_Rewrite((unat&)ep->ContextRecord->Eip,*(unat*)ep->ContextRecord->Esp,ep->ContextRecord->Eax) )
+		{
+			//remove the call from call stack
+			ep->ContextRecord->Esp+=4;
+			//restore the addr from eax to ecx so its valid again
+			ep->ContextRecord->Ecx=ep->ContextRecord->Eax;
+			return EXCEPTION_CONTINUE_EXECUTION;
+		}
+	*/
 #endif
 	else
 	{