diff --git a/pe-packer.sln b/pe-packer.sln
index 86f534e..b541ca4 100644
--- a/pe-packer.sln
+++ b/pe-packer.sln
@@ -7,14 +7,14 @@ Project("{36cc934f-acf5-4257-8a92-2e5a5cc892ee}") = "pe-packer", "pe-packer\pe-p
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug|x86 = Debug|x86
-		Release|x86 = Release|x86
+		Debug|x64 = Debug|x64
+		Release|x64 = Release|x64
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{da27f89d-d345-47db-a8c4-cc980bb3df57}.Debug|x86.ActiveCfg = Debug|Win32
-		{da27f89d-d345-47db-a8c4-cc980bb3df57}.Debug|x86.Build.0 = Debug|Win32
-		{da27f89d-d345-47db-a8c4-cc980bb3df57}.Release|x86.ActiveCfg = Release|Win32
-		{da27f89d-d345-47db-a8c4-cc980bb3df57}.Release|x86.Build.0 = Release|Win32
+		{da27f89d-d345-47db-a8c4-cc980bb3df57}.Debug|x64.ActiveCfg = Debug|x64
+		{da27f89d-d345-47db-a8c4-cc980bb3df57}.Debug|x64.Build.0 = Debug|x64
+		{da27f89d-d345-47db-a8c4-cc980bb3df57}.Release|x64.ActiveCfg = Release|x64
+		{da27f89d-d345-47db-a8c4-cc980bb3df57}.Release|x64.Build.0 = Release|x64
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
diff --git a/pe-packer/core/core.cpp b/pe-packer/core/core.cpp
index 4b1adff..2d12b22 100644
--- a/pe-packer/core/core.cpp
+++ b/pe-packer/core/core.cpp
@@ -28,8 +28,12 @@ c_core::c_core(std::string input_file, std::string output_file, std::uint32_t mu
 	}
 
 	JitRuntime jitRt;
+	Environment targetEnv = jitRt.environment();
+	targetEnv.setArch(Arch::kX86);
+	targetEnv.setSubArch(SubArch::kUnknown);
+
 	m_codeHolder = std::make_unique<CodeHolder>();
-	Error init_asmjit = m_codeHolder->init(jitRt.environment(), jitRt.cpuFeatures());
+	Error init_asmjit = m_codeHolder->init(targetEnv, jitRt.cpuFeatures());
 
 	if (init_asmjit != kErrorOk) {
 		print_error("Failed initialization\n");
diff --git a/pe-packer/pe-packer.vcxproj b/pe-packer/pe-packer.vcxproj
index 952542f..7b166e8 100644
--- a/pe-packer/pe-packer.vcxproj
+++ b/pe-packer/pe-packer.vcxproj
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|Win32">
+    <ProjectConfiguration Include="Debug|x64">
       <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
+      <Platform>x64</Platform>
     </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
+    <ProjectConfiguration Include="Release|x64">
       <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
+      <Platform>x64</Platform>
     </ProjectConfiguration>
   </ItemGroup>
   <PropertyGroup Label="Globals">
@@ -18,13 +18,13 @@
     <WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <UseDebugLibraries>true</UseDebugLibraries>
     <PlatformToolset>v143</PlatformToolset>
     <CharacterSet>MultiByte</CharacterSet>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <UseDebugLibraries>false</UseDebugLibraries>
     <PlatformToolset>v143</PlatformToolset>
@@ -36,14 +36,14 @@
   </ImportGroup>
   <ImportGroup Label="Shared">
   </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
   </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
   </ImportGroup>
   <PropertyGroup Label="UserMacros" />
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <ClCompile>
       <WarningLevel>Level3</WarningLevel>
       <SDLCheck>true</SDLCheck>
@@ -55,7 +55,7 @@
       <GenerateDebugInformation>true</GenerateDebugInformation>
     </Link>
   </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <ClCompile>
       <WarningLevel>Level3</WarningLevel>
       <FunctionLevelLinking>true</FunctionLevelLinking>