diff --git a/apps/zasm/emul/glue.asm b/apps/zasm/emul/glue.asm
index 6fb1a95..edaa75e 100644
--- a/apps/zasm/emul/glue.asm
+++ b/apps/zasm/emul/glue.asm
@@ -18,7 +18,8 @@ init:
 	call	USER_CODE
 	; signal the emulator we're done
 	; BC contains the number of written bytes
-	ld	a, b
+	ld	a, c
+	ld	c, b
 	out	(c), a
 	halt
 
diff --git a/apps/zasm/emul/zasm.c b/apps/zasm/emul/zasm.c
index 3cb911a..180f1ef 100644
--- a/apps/zasm/emul/zasm.c
+++ b/apps/zasm/emul/zasm.c
@@ -32,7 +32,7 @@ static uint8_t io_read(int unused, uint16_t addr)
 
 static void io_write(int unused, uint16_t addr, uint8_t val)
 {
-    written = (val << 8) + (addr & 0xff);
+    written = ((addr & 0xff) << 8) + (val & 0xff);
     running = 0;
 }