diff --git a/Changelog.txt b/Changelog.txt
index 5912ee9..b64fd0e 100644
--- a/Changelog.txt
+++ b/Changelog.txt
@@ -1,4 +1,5 @@
 Version 2.11
+- The replication now works on x86, again.
 - Fixed a bug in temporary index loading.
 
 Version 2.10
diff --git a/Src/DSInternals.Replication.Interop/DSInternals.Replication.Interop.vcxproj b/Src/DSInternals.Replication.Interop/DSInternals.Replication.Interop.vcxproj
index 35a07e1..12d3254 100644
--- a/Src/DSInternals.Replication.Interop/DSInternals.Replication.Interop.vcxproj
+++ b/Src/DSInternals.Replication.Interop/DSInternals.Replication.Interop.vcxproj
@@ -100,7 +100,6 @@
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
       <ExceptionHandling>false</ExceptionHandling>
       <CompileAsManaged>true</CompileAsManaged>
-      <ForcedIncludeFiles>stdafx.h;%(ForcedIncludeFiles)</ForcedIncludeFiles>
       <PrecompiledHeaderFile>stdafx.h</PrecompiledHeaderFile>
     </ClCompile>
     <Link>
@@ -130,7 +129,6 @@
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
       <ExceptionHandling>false</ExceptionHandling>
       <CompileAsManaged>true</CompileAsManaged>
-      <ForcedIncludeFiles>stdafx.h;%(ForcedIncludeFiles)</ForcedIncludeFiles>
       <PrecompiledHeaderFile>stdafx.h</PrecompiledHeaderFile>
     </ClCompile>
     <Link>
@@ -159,7 +157,6 @@
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
       <ExceptionHandling>Async</ExceptionHandling>
       <PrecompiledHeaderFile>stdafx.h</PrecompiledHeaderFile>
-      <ForcedIncludeFiles>stdafx.h;%(ForcedIncludeFiles)</ForcedIncludeFiles>
     </ClCompile>
     <Link>
       <GenerateDebugInformation>false</GenerateDebugInformation>
@@ -185,7 +182,6 @@
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
       <ExceptionHandling>Async</ExceptionHandling>
       <PrecompiledHeaderFile>stdafx.h</PrecompiledHeaderFile>
-      <ForcedIncludeFiles>stdafx.h;%(ForcedIncludeFiles)</ForcedIncludeFiles>
     </ClCompile>
     <Link>
       <GenerateDebugInformation>false</GenerateDebugInformation>
@@ -216,11 +212,17 @@
     <ClInclude Include="RpcTypeConverter.h" />
     <ClInclude Include="resource.h" />
     <ClInclude Include="stdafx.h" />
+    <ClInclude Include="unmanaged.h" />
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="AssemblyInfo.cpp" />
     <ClCompile Include="DrsConnection.cpp" />
-    <ClCompile Include="drsr.cpp" />
+    <ClCompile Include="drsr.cpp">
+      <ForcedIncludeFiles Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">stdafx.h;unmanaged.h;%(ForcedIncludeFiles)</ForcedIncludeFiles>
+      <ForcedIncludeFiles Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">stdafx.h;unmanaged.h;%(ForcedIncludeFiles)</ForcedIncludeFiles>
+      <ForcedIncludeFiles Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">stdafx.h;unmanaged.h;%(ForcedIncludeFiles)</ForcedIncludeFiles>
+      <ForcedIncludeFiles Condition="'$(Configuration)|$(Platform)'=='Release|x64'">stdafx.h;unmanaged.h;%(ForcedIncludeFiles)</ForcedIncludeFiles>
+    </ClCompile>
     <ClCompile Include="drsr_addons.cpp" />
     <ClCompile Include="drsr_alloc.cpp" />
     <ClCompile Include="midl_alloc.cpp" />
diff --git a/Src/DSInternals.Replication.Interop/DSInternals.Replication.Interop.vcxproj.filters b/Src/DSInternals.Replication.Interop/DSInternals.Replication.Interop.vcxproj.filters
index 412ebc4..d6312dd 100644
--- a/Src/DSInternals.Replication.Interop/DSInternals.Replication.Interop.vcxproj.filters
+++ b/Src/DSInternals.Replication.Interop/DSInternals.Replication.Interop.vcxproj.filters
@@ -42,6 +42,9 @@
     <ClInclude Include="RpcTypeConverter.h">
       <Filter>Header Files</Filter>
     </ClInclude>
+    <ClInclude Include="unmanaged.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="AssemblyInfo.cpp">
diff --git a/Src/DSInternals.Replication.Interop/unmanaged.h b/Src/DSInternals.Replication.Interop/unmanaged.h
new file mode 100644
index 0000000..6a9615f
--- /dev/null
+++ b/Src/DSInternals.Replication.Interop/unmanaged.h
@@ -0,0 +1,8 @@
+/*
+Including this header will disable managed code in a C++ file, even if compiled with the /CLR parameter.
+We need to do this with files generated by MIDL.
+Otherwise, we get "The Array Bounds Are Invalid" error from at least one RPC call on the x86 platform.
+Strangely enough, this hack is not needed on the x64 platform.
+*/
+#pragma once
+#pragma managed(push, off)
\ No newline at end of file