diff --git a/src/asm/jump_x86_64_ms_pe_gas.asm b/src/asm/jump_x86_64_ms_pe_gas.asm
index 6572c07..ec4ecfe 100644
--- a/src/asm/jump_x86_64_ms_pe_gas.asm
+++ b/src/asm/jump_x86_64_ms_pe_gas.asm
@@ -116,7 +116,7 @@ jump_fcontext:
     /* load NT_TIB */
     movq  %gs:(0x30), %r10
     /* save fiber local storage */
-    movq  0x18(%r10), %rax
+    movq  0x20(%r10), %rax
     movq  %rax, 0xb0(%rsp)
     /* save current deallocation stack */
     movq  0x1478(%r10), %rax
@@ -165,7 +165,7 @@ jump_fcontext:
     movq  %gs:(0x30), %r10
     /* restore fiber local storage */
     movq  0xb0(%rsp), %rax
-    movq  %rax, 0x18(%r10)
+    movq  %rax, 0x20(%r10)
     /* restore current deallocation stack */
     movq  0xb8(%rsp), %rax
     movq  %rax, 0x1478(%r10)
diff --git a/src/asm/jump_x86_64_ms_pe_masm.asm b/src/asm/jump_x86_64_ms_pe_masm.asm
index cc8a9e9..c8a28a5 100644
--- a/src/asm/jump_x86_64_ms_pe_masm.asm
+++ b/src/asm/jump_x86_64_ms_pe_masm.asm
@@ -111,7 +111,7 @@ ENDIF
     ; load NT_TIB
     mov  r10,  gs:[030h]
     ; save fiber local storage
-    mov  rax, [r10+018h]
+    mov  rax, [r10+020h]
     mov  [rsp+0b0h], rax
     ; save current deallocation stack
     mov  rax, [r10+01478h]
@@ -162,7 +162,7 @@ ENDIF
     mov  r10,  gs:[030h]
     ; restore fiber local storage
     mov  rax, [rsp+0b0h]
-    mov  [r10+018h], rax
+    mov  [r10+020h], rax
     ; restore current deallocation stack
     mov  rax, [rsp+0b8h]
     mov  [r10+01478h], rax
diff --git a/src/asm/ontop_x86_64_ms_pe_gas.asm b/src/asm/ontop_x86_64_ms_pe_gas.asm
index 8ceedaf..02e040c 100644
--- a/src/asm/ontop_x86_64_ms_pe_gas.asm
+++ b/src/asm/ontop_x86_64_ms_pe_gas.asm
@@ -116,7 +116,7 @@ ontop_fcontext:
     /* load NT_TIB */
     movq  %gs:(0x30), %r10
     /* save fiber local storage */
-    movq  0x18(%r10), %rax
+    movq  0x20(%r10), %rax
     movq  %rax, 0xb0(%rsp)
     /* save current deallocation stack */
     movq  0x1478(%r10), %rax
@@ -165,7 +165,7 @@ ontop_fcontext:
     movq  %gs:(0x30), %r10
     /* restore fiber local storage */
     movq  0xb0(%rsp), %rax
-    movq  %rax, 0x18(%r10)
+    movq  %rax, 0x20(%r10)
     /* restore current deallocation stack */
     movq  0xb8(%rsp), %rax
     movq  %rax, 0x1478(%r10)
diff --git a/src/asm/ontop_x86_64_ms_pe_masm.asm b/src/asm/ontop_x86_64_ms_pe_masm.asm
index 91cc6c6..b57dd15 100644
--- a/src/asm/ontop_x86_64_ms_pe_masm.asm
+++ b/src/asm/ontop_x86_64_ms_pe_masm.asm
@@ -111,7 +111,7 @@ ENDIF
     ; load NT_TIB
     mov  r10,  gs:[030h]
     ; save fiber local storage
-    mov  rax, [r10+018h]
+    mov  rax, [r10+020h]
     mov  [rsp+0b0h], rax
     ; save current deallocation stack
     mov  rax, [r10+01478h]
@@ -162,7 +162,7 @@ ENDIF
     mov  r10,  gs:[030h]
     ; restore fiber local storage
     mov  rax, [rsp+0b0h]
-    mov  [r10+018h], rax
+    mov  [r10+020h], rax
     ; restore current deallocation stack
     mov  rax, [rsp+0b8h]
     mov  [r10+01478h], rax