diff --git a/bdshemu/bdshemu.c b/bdshemu/bdshemu.c
index 3a6e1a5..bf1a4d6 100644
--- a/bdshemu/bdshemu.c
+++ b/bdshemu/bdshemu.c
@@ -386,7 +386,7 @@ ShemuSetFlags(
 
         if (Src2 == 1)
         {
-            if (ND_GET_BIT(Size * 8ULL - 1, Dst) ^ ND_GET_BIT(Size * 8ULL - Src2, Src1))
+            if (ND_GET_BIT(Size * 8ULL - 1, Src1) ^ ND_GET_BIT(Size * 8ULL - 2, Src1))
             {
                 Context->Registers.RegFlags |= NDR_RFLAG_OF;
             }
@@ -410,7 +410,7 @@ ShemuSetFlags(
 
         if (Src2 == 1)
         {
-            if (ND_GET_BIT(Size * 8 - 1, Dst))
+            if (ND_GET_BIT(Size * 8ULL - 1, Src1))
             {
                 Context->Registers.RegFlags |= NDR_RFLAG_OF;
             }
diff --git a/bdshemu/bdshemu.vcxproj b/bdshemu/bdshemu.vcxproj
index ddf8a46..86ae440 100644
--- a/bdshemu/bdshemu.vcxproj
+++ b/bdshemu/bdshemu.vcxproj
@@ -115,7 +115,8 @@
     <UseDebugLibraries>true</UseDebugLibraries>
     <PlatformToolset>WindowsKernelModeDriver10.0</PlatformToolset>
     <CharacterSet>Unicode</CharacterSet>
-    <TargetVersion></TargetVersion>
+    <TargetVersion>
+    </TargetVersion>
     <DriverTargetPlatform>Desktop</DriverTargetPlatform>
     <SupportsPackaging>false</SupportsPackaging>
   </PropertyGroup>
@@ -149,7 +150,8 @@
     <PlatformToolset>WindowsKernelModeDriver10.0</PlatformToolset>
     <WholeProgramOptimization>false</WholeProgramOptimization>
     <CharacterSet>Unicode</CharacterSet>
-    <TargetVersion></TargetVersion>
+    <TargetVersion>
+    </TargetVersion>
     <DriverTargetPlatform>Desktop</DriverTargetPlatform>
     <SupportsPackaging>false</SupportsPackaging>
   </PropertyGroup>
@@ -644,6 +646,7 @@
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="..\inc\bdshemu.h" />
+    <ClInclude Include="..\inc\version.h" />
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
diff --git a/bdshemu/bdshemu.vcxproj.filters b/bdshemu/bdshemu.vcxproj.filters
index ba58200..1402533 100644
--- a/bdshemu/bdshemu.vcxproj.filters
+++ b/bdshemu/bdshemu.vcxproj.filters
@@ -26,5 +26,8 @@
     <ClInclude Include="..\inc\bdshemu.h">
       <Filter>Header Files\public</Filter>
     </ClInclude>
+    <ClInclude Include="..\inc\version.h">
+      <Filter>Header Files\public</Filter>
+    </ClInclude>
   </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/bdshemu_test/bdshemu_test.zip b/bdshemu_test/bdshemu_test.zip
index a89035a..e0decc9 100644
Binary files a/bdshemu_test/bdshemu_test.zip and b/bdshemu_test/bdshemu_test.zip differ
diff --git a/inc/version.h b/inc/version.h
index aea37fc..e99b5f1 100644
--- a/inc/version.h
+++ b/inc/version.h
@@ -7,6 +7,11 @@
 
 #define DISASM_VERSION_MAJOR        1
 #define DISASM_VERSION_MINOR        34
-#define DISASM_VERSION_REVISION     17
+#define DISASM_VERSION_REVISION     18
+
+// bdshemu depends on bddisasm. It cannot be used without it.
+#define SHEMU_VERSION_MAJOR         1
+#define SHEMU_VERSION_MINOR         1
+#define SHEMU_VERSION_REVISION      11
 
 #endif // DISASM_VER_H