diff --git a/drivers/nvme/nvme.asm b/drivers/nvme/nvme.asm
index fbbf720..e256176 100644
--- a/drivers/nvme/nvme.asm
+++ b/drivers/nvme/nvme.asm
@@ -53,8 +53,8 @@ proc START c, reason:dword
 	DEBUGF  DBG_INFO, "p_nvme_devices: 0x%x\n", [p_nvme_devices]
 
 .loop:
-	push 	ebx
 	lea 	esi, [esi + ebx * 4]
+	push 	esi ebx
 	stdcall device_is_compat, esi
 	test 	eax, eax
 	jz 	@f
@@ -63,11 +63,11 @@ proc START c, reason:dword
 	jz 	@f
 
 @@:
-	pop 	ebx
+	pop 	ebx esi
 	inc 	ebx
 	cmp 	ebx, dword [pcidevs_len]
 	jne 	.loop
-	stdcall add_nvme_disk, dword [p_nvme_devices]
+	stdcall add_nvme_disk, esi
 	invoke  RegService, my_service, service_proc
 	ret