diff --git a/src/mbr/mbr.nasm b/src/mbr/mbr.nasm
index 973d1ca..de84aae 100755
--- a/src/mbr/mbr.nasm
+++ b/src/mbr/mbr.nasm
@@ -22,7 +22,9 @@
 [ORG 0x7A00]
 [CPU KATMAI]
 [WARNING -reloc-abs-word]
-jmp short init
+%define __STEVIA_MBR
+
+jmp short (init - $$)
 nop
 
 ; ###############
@@ -31,8 +33,6 @@ nop
 ;
 ; ###############
 
-%define __STEVIA_MBR
-
 %include "cdecl16.inc"
 %include "entry.inc"
 %include "config.inc"
diff --git a/src/stage2/stage2.nasm b/src/stage2/stage2.nasm
index 337b2de..b4750d7 100755
--- a/src/stage2/stage2.nasm
+++ b/src/stage2/stage2.nasm
@@ -23,7 +23,10 @@
 [CPU KATMAI]
 [WARNING -reloc-abs-word]
 [WARNING -reloc-abs-dword]
-jmp short init
+%define __STEVIA_STAGE2
+
+__STAGE2_ENTRY:
+jmp short (init - $$)
 nop
 
 ; ###############
@@ -32,8 +35,6 @@ nop
 ;
 ; ###############
 
-%define __STEVIA_STAGE2
-
 %include "cdecl16.inc"
 %include "entry.inc"
 %include "config.inc"
diff --git a/src/vbr/vbr.nasm b/src/vbr/vbr.nasm
index ba804da..9018af1 100755
--- a/src/vbr/vbr.nasm
+++ b/src/vbr/vbr.nasm
@@ -21,8 +21,12 @@
 [ORG 0x7C00]
 [CPU KATMAI]
 [WARNING -reloc-abs-word]
-jmp short init
-nop
+%define __STEVIA_VBR
+
+__ENTRY:
+    jmp short (init_thunk - $$)
+    nop
+    
 phy_bpb_start:
 ; fill BPB area with 0x00 since we skip writing this part to disk
 ; but we need it for the 'jmp short entry; nop' above
@@ -36,7 +40,6 @@ times 54 db 0x00
 ; Headers/Includes/Definitions
 ;
 ; ###############
-%define __STEVIA_VBR
 
 %include "cdecl16.inc"
 %include "entry.inc"