diff --git a/src/stub/i086-dos16.com.h b/src/stub/i086-dos16.com.h
index 94c633dd..d46cadc4 100644
--- a/src/stub/i086-dos16.com.h
+++ b/src/stub/i086-dos16.com.h
@@ -28,8 +28,8 @@
 
 
 #define NRV2B_LOADER_SIZE    9078
-#define NRV2B_LOADER_ADLER32 0xc018f5d2
-#define NRV2B_LOADER_CRC32   0xc04198a5
+#define NRV2B_LOADER_ADLER32 0x2d8ff59a
+#define NRV2B_LOADER_CRC32   0x56792cc8
 
 unsigned char nrv2b_loader[9078] = {
 127, 69, 76, 70,  1,  1,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,   /* 0x   0 */
@@ -44,9 +44,9 @@ unsigned char nrv2b_loader[9078] = {
 117,  8, 65,232,  6,  0,115,251, 65, 65, 65,129,253,  0,243,131,   /* 0x  90 */
 209,  1,141,  3,150,243,164,150,235,  0,232,  2,  0, 17,201,  1,   /* 0x  a0 */
 219,117,  4,173, 17,192,147,195, 94,185,  0,  0,172, 44,232, 60,   /* 0x  b0 */
-  1,119,249,193,  4,  8, 41, 52,139, 28,134,251, 41,243,137, 28,   /* 0x  c0 */
+  1,119,249,193,  4,  8, 41, 52,139, 28,134,223, 41,243,137, 28,   /* 0x  c0 */
 173,226,  3,176,232,176,233, 95,185,  0,  0,242,174,117, 20,117,   /* 0x  d0 */
-  2,193,  5,  8, 41, 61,139, 29,134,251, 41,251,137, 29,175,235,   /* 0x  e0 */
+  2,193,  5,  8, 41, 61,139, 29,134,223, 41,251,137, 29,175,235,   /* 0x  e0 */
   3,195,  0, 46,115,121,109,116, 97, 98,  0, 46,115,116,114,116,   /* 0x  f0 */
  97, 98,  0, 46,115,104,115,116,114,116, 97, 98,  0, 46,114,101,   /* 0x 100 */
 108, 67, 79, 77, 77, 65, 73, 78, 49,  0, 67, 79, 77, 83, 66, 66,   /* 0x 110 */
diff --git a/src/stub/i086-dos16.sys.h b/src/stub/i086-dos16.sys.h
index 31588ba6..ee5ce29e 100644
--- a/src/stub/i086-dos16.sys.h
+++ b/src/stub/i086-dos16.sys.h
@@ -28,8 +28,8 @@
 
 
 #define NRV2B_LOADER_SIZE    10474
-#define NRV2B_LOADER_ADLER32 0xecf2e57f
-#define NRV2B_LOADER_CRC32   0x17b99596
+#define NRV2B_LOADER_ADLER32 0x2b62e547
+#define NRV2B_LOADER_CRC32   0xf800e9e1
 
 unsigned char nrv2b_loader[10474] = {
 127, 69, 76, 70,  1,  1,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,   /* 0x   0 */
@@ -45,9 +45,9 @@ unsigned char nrv2b_loader[10474] = {
   0,115,251, 65, 65, 65,129,253,  0,243,131,209,  1,141,  3,150,   /* 0x  a0 */
 243,164,150,235,  0,232,  2,  0, 17,201,  1,219,117,  4,173, 17,   /* 0x  b0 */
 192,147,195, 94,185,  0,  0,172, 44,232, 60,  1,119,249,193,  4,   /* 0x  c0 */
-  8, 41, 52,139, 28,134,251, 41,243,137, 28,173,226,  3,176,232,   /* 0x  d0 */
+  8, 41, 52,139, 28,134,223, 41,243,137, 28,173,226,  3,176,232,   /* 0x  d0 */
 176,233, 95,185,  0,  0,242,174,117, 20,117,  2,193,  5,  8, 41,   /* 0x  e0 */
- 61,139, 29,134,251, 41,251,137, 29,175,235,  3,  7, 97, 93, 95,   /* 0x  f0 */
+ 61,139, 29,134,223, 41,251,137, 29,175,235,  3,  7, 97, 93, 95,   /* 0x  f0 */
  94, 90, 89, 91, 88,233,254,255,  0, 46,115,121,109,116, 97, 98,   /* 0x 100 */
   0, 46,115,116,114,116, 97, 98,  0, 46,115,104,115,116,114,116,   /* 0x 110 */
  97, 98,  0, 46,114,101,108, 83, 89, 83, 77, 65, 73, 78, 49,  0,   /* 0x 120 */
diff --git a/src/stub/src/arch/i086/macros.S b/src/stub/src/arch/i086/macros.S
index 02b88fb3..2d602657 100644
--- a/src/stub/src/arch/i086/macros.S
+++ b/src/stub/src/arch/i086/macros.S
@@ -140,7 +140,7 @@ section         CT16SUB0
                 sub     [si], si
 section         CT16I086
                 mov     bx, [si]
-                xchg    bl, bh
+                xchg    bh, bl
                 sub     bx, si
                 mov     [si], bx
 section         CALLTRI2
@@ -173,7 +173,7 @@ section         CT16SUB1
                 sub     [di], di
 section         CT16I087
                 mov     bx, [di]
-                xchg    bl, bh
+                xchg    bh, bl
                 sub     bx, di
                 mov     [di], bx
 section         CALLTRI6